diff --git a/TODO.md b/TODO.md
index 210db5f4..39736c52 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,5 +1,6 @@
 # TODO
 
+- account context menu
 - add account number binds
 - rename goto*account → scrollto*account
 
diff --git a/src/gui/MainPane/RoomList.qml b/src/gui/MainPane/RoomList.qml
index 96e5e3ae..b46c104e 100644
--- a/src/gui/MainPane/RoomList.qml
+++ b/src/gui/MainPane/RoomList.qml
@@ -2,6 +2,7 @@
 
 import QtQuick 2.12
 import QtQuick.Layouts 1.12
+import QtQml.Models 2.12
 import ".."
 import "../Base"
 
@@ -17,7 +18,7 @@ HListView {
         delegate: Room {
             id: room
             width: roomList.width
-            onActivated: showRoomAtIndex(model.index)
+            onActivated: showRoomAtIndex(DelegateModel.filteredIndex)
             ListView.onAdd: ParallelAnimation {
                 HNumberAnimation {
                     target: room; property: "opacity"; from: 0; to: 1;