diff --git a/src/qml/Page/RoomListPage.qml b/src/qml/Page/RoomListPage.qml
index fe0c3f48b..dd94fb665 100644
--- a/src/qml/Page/RoomListPage.qml
+++ b/src/qml/Page/RoomListPage.qml
@@ -134,7 +134,7 @@ Kirigami.ScrollablePage {
     function goToNextRoom() {
         do {
             listView.incrementCurrentIndex();
-        } while (!listView.currentItem.visible && listView.currentIndex === listView.count)
+        } while (!listView.currentItem.visible && listView.currentIndex !== listView.count - 1)
         listView.currentItem.action.trigger();
     }