diff --git a/imports/NeoChat/Page/RoomListPage.qml b/imports/NeoChat/Page/RoomListPage.qml
index f4b6db261..b25c12cf2 100644
--- a/imports/NeoChat/Page/RoomListPage.qml
+++ b/imports/NeoChat/Page/RoomListPage.qml
@@ -4,7 +4,7 @@
  *
  * SPDX-License-Identifier: GPL-3.0-only
  */
-import QtQuick 2.12
+import QtQuick 2.15
 import QtQuick.Controls 2.12 as QQC2
 import QtQuick.Layouts 1.12
 
@@ -48,6 +48,7 @@ Kirigami.ScrollablePage {
 
     ListView {
         id: listView
+
         Kirigami.PlaceholderMessage {
             anchors.centerIn: parent
             width: parent.width - (Kirigami.Units.largeSpacing * 4)
@@ -59,7 +60,8 @@ Kirigami.ScrollablePage {
                 onTriggered: pageStack.layers.push("qrc:/imports/NeoChat/Page/JoinRoomPage.qml", {"connection": activeConnection, "keyword": sortFilterRoomListModel.filterText})
             }
         }
-        model:  SortFilterRoomListModel {
+
+        model: SortFilterRoomListModel {
             id: sortFilterRoomListModel
             sourceModel: RoomListModel {
                 id: roomListModel
@@ -90,6 +92,9 @@ Kirigami.ScrollablePage {
             }
         }
 
+        reuseItems: true
+        currentIndex: -1 // we don't want any room highlighted by default
+
         delegate: Kirigami.BasicListItem {
             id: roomListItem
             visible: model.categoryVisible || sortFilterRoomListModel.filterText.length > 0 || Config.mergeRoomList