diff --git a/qml/FullscreenFrame.qml b/qml/FullscreenFrame.qml
index df6c267e..5829386b 100644
--- a/qml/FullscreenFrame.qml
+++ b/qml/FullscreenFrame.qml
@@ -883,8 +883,12 @@ InputEventItem {
         Connections {
             target: LauncherController
             function onVisibleChanged() {
+                if (LauncherController.visible) {
+                    searchEdit.forceActiveFocus()
+                    return
+                }
+
                 // only do these clean-up steps on launcher get hide
-                if (LauncherController.visible) return
                 // clear searchEdit text
                 searchEdit.text = ""
                 if (listviewPage.currentItem) {
diff --git a/qml/windowed/WindowedFrame.qml b/qml/windowed/WindowedFrame.qml
index fc763c32..f4bee7db 100644
--- a/qml/windowed/WindowedFrame.qml
+++ b/qml/windowed/WindowedFrame.qml
@@ -303,9 +303,12 @@ InputEventItem {
     Connections {
         target: LauncherController
         function onVisibleChanged() {
-            // only do these clean-up steps on launcher get hide
-            if (LauncherController.visible) return
+            if (LauncherController.visible) {
+                bottomBar.searchEdit.forceActiveFocus()
+                return
+            }
 
+            // only do these clean-up steps on launcher get hide
             // clear searchEdit text
             bottomBar.searchEdit.text = ""
             // reset(remove) keyboard focus