diff --git a/src/gui/MainPane/MainPane.qml b/src/gui/MainPane/MainPane.qml
index 17b10ec2..cf32c6c9 100644
--- a/src/gui/MainPane/MainPane.qml
+++ b/src/gui/MainPane/MainPane.qml
@@ -26,7 +26,7 @@ HDrawer {
 
 
     function toggleFocus() {
-        if (bottomBar.filterField.activeFocus) {
+        if (mainPane.activeFocus) {
             pageLoader.takeFocus()
             return
         }
diff --git a/src/gui/Pages/Chat/RoomPane/RoomPane.qml b/src/gui/Pages/Chat/RoomPane/RoomPane.qml
index 0d5d1042..f9629bc3 100644
--- a/src/gui/Pages/Chat/RoomPane/RoomPane.qml
+++ b/src/gui/Pages/Chat/RoomPane/RoomPane.qml
@@ -57,7 +57,7 @@ MultiviewPane {
 
 
     function toggleFocus() {
-        if (swipeView.currentItem.keybindFocusItem.activeFocus) {
+        if (roomPane.activeFocus) {
             if (roomPane.collapse) roomPane.close()
             pageLoader.takeFocus()
             return