diff --git a/src/gui/Base/HListView.qml b/src/gui/Base/HListView.qml
index f5a5f7b9..4e938c6e 100644
--- a/src/gui/Base/HListView.qml
+++ b/src/gui/Base/HListView.qml
@@ -68,9 +68,6 @@ ListView {
     property int lastCheckedDelegateIndex: 0
     property int selectedCount: Object.keys(checked).length
 
-    readonly property var currentIndexModel:
-        currentIndex === -1 ? null : model.get(currentIndex)
-
 
     function check(...indices) {
         for (const i of indices) {
diff --git a/src/gui/MainPane/RoomList.qml b/src/gui/MainPane/RoomList.qml
index b531eca1..acfaba1b 100644
--- a/src/gui/MainPane/RoomList.qml
+++ b/src/gui/MainPane/RoomList.qml
@@ -21,10 +21,12 @@ HListView {
                 rightPadding: 0  // the right buttons have padding
 
                 filterActive: Boolean(filter)
-                enableKeybinds:
-                    currentIndexModel &&
-                    (currentIndexModel.for_account || currentIndexModel.id) ===
-                    model.id
+                enableKeybinds: Boolean(
+                    roomList.model.get(currentIndex) && (
+                        roomList.model.get(currentIndex).for_account ||
+                        roomList.model.get(currentIndex).id
+                    ) === model.id
+                )
 
                 totalMessageIndicator.visible: false
 
@@ -43,7 +45,25 @@ HListView {
         }
     }
 
-    onFilterChanged: py.callCoro("set_substring_filter", ["all_rooms", filter])
+    onFilterChanged: {
+        py.callCoro("set_substring_filter", ["all_rooms", filter])
+
+        const item = model.get(currentIndex)
+
+        if (
+            ! filter &&
+            item && ((
+                currentShouldBeAccount &&
+                wantedUserId !== item.id
+            ) || (
+                currentShouldBeRoom && (
+                    wantedUserId !== item.for_account ||
+                    wantedRoomId !== item.id
+                )
+            ))
+        )
+            currentIndex = -1  // will trigger the correctTimer
+    }
 
 
     property string filter: ""
@@ -172,6 +192,7 @@ HListView {
     Timer {
         // On startup, the account/room takes an unknown amount of time to
         // arrive in the model, try to find it until then.
+        id: correctTimer
         interval: 200
         running: currentIndex === -1
         repeat: true