diff --git a/dots/.config/quickshell/ii/modules/waffle/bar/SearchButton.qml b/dots/.config/quickshell/ii/modules/waffle/bar/SearchButton.qml
index 3e8dd6282..6bb48f8fc 100644
--- a/dots/.config/quickshell/ii/modules/waffle/bar/SearchButton.qml
+++ b/dots/.config/quickshell/ii/modules/waffle/bar/SearchButton.qml
@@ -12,9 +12,9 @@ AppButton {
     iconName: checked ? "system-search-checked" : "system-search"
     separateLightDark: true
 
-    checked: GlobalStates.overviewOpen
+    checked: GlobalStates.searchOpen && LauncherSearch.query !== ""
     onClicked: {
-        GlobalStates.overviewOpen = !GlobalStates.overviewOpen; // For now...
+        GlobalStates.searchOpen = !GlobalStates.searchOpen; // For now...
     }
 
     BarToolTip {
diff --git a/dots/.config/quickshell/ii/modules/waffle/bar/StartButton.qml b/dots/.config/quickshell/ii/modules/waffle/bar/StartButton.qml
index a92a85578..7fa716b07 100644
--- a/dots/.config/quickshell/ii/modules/waffle/bar/StartButton.qml
+++ b/dots/.config/quickshell/ii/modules/waffle/bar/StartButton.qml
@@ -14,7 +14,7 @@ AppButton {
     leftInset: Config.options.waffles.bar.leftAlignApps ? 12 : 0
     iconName: down ? "start-here-pressed" : "start-here"
 
-    checked: GlobalStates.searchOpen
+    checked: GlobalStates.searchOpen && LauncherSearch.query === ""
     onClicked: {
         GlobalStates.searchOpen = !GlobalStates.searchOpen;
     }