diff --git a/src/app/qml/RoomPage.qml b/src/app/qml/RoomPage.qml
index a2231430c..2f585ee44 100644
--- a/src/app/qml/RoomPage.qml
+++ b/src/app/qml/RoomPage.qml
@@ -119,6 +119,18 @@ Kirigami.Page {
         }
     ]
 
+    Kirigami.Action {
+        enabled: root.currentRoom && !root.currentRoom.isSpace
+        shortcut: "Ctrl+F"
+        onTriggered: {
+            ((root.QQC2.ApplicationWindow.window as Kirigami.ApplicationWindow).pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'RoomSearchPage'), {
+                room: root.currentRoom
+            }, {
+                title: i18nc("@action:title", "Search")
+            });
+        }
+    }
+
     KeyNavigation.left: (root.Kirigami.PageStack.pageStack as Kirigami.PageRow).get(0)
 
     onCurrentRoomChanged: {
diff --git a/src/rooms/ExploreComponent.qml b/src/rooms/ExploreComponent.qml
index db6a62736..1871971b6 100644
--- a/src/rooms/ExploreComponent.qml
+++ b/src/rooms/ExploreComponent.qml
@@ -46,10 +46,6 @@ RowLayout {
         onClicked: root.search();
         icon.name: "search"
         text: i18nc("@action", "Search Rooms")
-        Shortcut {
-            sequence: "Ctrl+F"
-            onActivated: searchButton.clicked()
-        }
 
         QQC2.ToolTip.visible: hovered
         QQC2.ToolTip.text: text