diff --git a/app/gui/AppView.qml b/app/gui/AppView.qml
index f0062fbe..09a5c2dc 100644
--- a/app/gui/AppView.qml
+++ b/app/gui/AppView.qml
@@ -123,6 +123,9 @@ CenteredGridView {
 
             sourceComponent: Item {
                 RoundButton {
+                    // Don't steal focus from the toolbar buttons
+                    focusPolicy: Qt.NoFocus
+
                     anchors.horizontalCenterOffset: appIcon.isPlaceholder ? -47 : 0
                     anchors.verticalCenterOffset: appIcon.isPlaceholder ? -75 : -60
                     anchors.centerIn: parent
@@ -146,6 +149,9 @@ CenteredGridView {
                 }
 
                 RoundButton {
+                    // Don't steal focus from the toolbar buttons
+                    focusPolicy: Qt.NoFocus
+
                     anchors.horizontalCenterOffset: appIcon.isPlaceholder ? 47 : 0
                     anchors.verticalCenterOffset: appIcon.isPlaceholder ? -75 : 60
                     anchors.centerIn: parent
diff --git a/app/gui/NavigableItemDelegate.qml b/app/gui/NavigableItemDelegate.qml
index 94bb85be..ef29ec0e 100644
--- a/app/gui/NavigableItemDelegate.qml
+++ b/app/gui/NavigableItemDelegate.qml
@@ -17,6 +17,11 @@ ItemDelegate {
     }
     Keys.onUpPressed: {
         grid.moveCurrentIndexUp()
+
+        // If we've reached the top of the grid, move focus to the toolbar
+        if (grid.currentItem === this) {
+            nextItemInFocusChain(false).forceActiveFocus(Qt.TabFocus)
+        }
     }
     Keys.onReturnPressed: {
         clicked()