diff --git a/src/declarativeimports/plasmacomponents3/ToolButton.qml b/src/declarativeimports/plasmacomponents3/ToolButton.qml
index 7f51cad8d..09796cb49 100644
--- a/src/declarativeimports/plasmacomponents3/ToolButton.qml
+++ b/src/declarativeimports/plasmacomponents3/ToolButton.qml
@@ -32,6 +32,9 @@ T.ToolButton {
     Kirigami.MnemonicData.controlType: Kirigami.MnemonicData.SecondaryControl
     Kirigami.MnemonicData.label: control.text
 
+    // KF6 TODO: investigate setting this by default
+    // focusPolicy: Qt.TabFocus
+
     Shortcut {
         //in case of explicit & the button manages it by itself
         enabled: !(RegExp(/\&[^\&]/).test(control.text))