diff --git a/src/controls/GlobalDrawer.qml b/src/controls/GlobalDrawer.qml
index 7efa7e3214d0f4df88ea555503e85f4f5fdc575a..2e90e0e8e96aca79cde41f81348bd42cb4d50733 100644
--- a/src/controls/GlobalDrawer.qml
+++ b/src/controls/GlobalDrawer.qml
@@ -472,6 +472,12 @@ OverlayDrawer {
 
                             separatorVisible: false
                             onClicked: stackView.pop()
+
+                            Keys.onEnterPressed: stackView.pop()
+                            Keys.onReturnPressed: stackView.pop()
+
+                            Keys.onDownPressed: nextItemInFocusChain().focus = true
+                            Keys.onUpPressed: nextItemInFocusChain(false).focus = true
                         }
                         Shortcut {
                             sequence: backItem.MnemonicData.sequence
diff --git a/src/controls/ListSectionHeader.qml b/src/controls/ListSectionHeader.qml
index 2fb4e660ebe7fd8d0f3d880edcefd94fc411ab99..a2cfa39fb7def06dab480e41de030ce0402ccb4a 100644
--- a/src/controls/ListSectionHeader.qml
+++ b/src/controls/ListSectionHeader.qml
@@ -56,6 +56,8 @@ Kirigami.AbstractListItem {
     sectionDelegate: true
     hoverEnabled: false
 
+    activeFocusOnTab: false
+
     contentItem: RowLayout {
         id: rowLayout
 
diff --git a/src/controls/private/GlobalDrawerActionItem.qml b/src/controls/private/GlobalDrawerActionItem.qml
index 5f3e17dfa28dbd57347d4052f619e18341a18122..ee86a43744869373eb8a66147926c0aa57b7bbc4 100644
--- a/src/controls/private/GlobalDrawerActionItem.qml
+++ b/src/controls/private/GlobalDrawerActionItem.qml
@@ -143,7 +143,12 @@ AbstractListItem {
             }
         }
     }
-    onClicked: {
+
+    onClicked: trigger()
+    Keys.onEnterPressed: trigger()
+    Keys.onReturnPressed: trigger()
+
+    function trigger() {
         if (!supportsMouseEvents) {
             return;
         }
@@ -167,4 +172,7 @@ AbstractListItem {
         }
         checked = Qt.binding(function() { return modelData.checked || (actionsMenu && actionsMenu.visible) });
     }
+
+    Keys.onDownPressed: nextItemInFocusChain().focus = true
+    Keys.onUpPressed: nextItemInFocusChain(false).focus = true
 }