diff --git a/quickshell/Modals/Settings/SettingsModal.qml b/quickshell/Modals/Settings/SettingsModal.qml
index 557d76d97..d9c40f6af 100644
--- a/quickshell/Modals/Settings/SettingsModal.qml
+++ b/quickshell/Modals/Settings/SettingsModal.qml
@@ -141,6 +141,11 @@ DFloatingWindow {
 
     function showKeybindsSearch(query: string) {
         keybindSearchQuery = query || "";
+        // From inside settings keep the history so back returns to the calling page
+        if (visible) {
+            navigateTo("keybinds");
+            return;
+        }
         showWithTabName("keybinds");
     }