diff --git a/src/gui/MainPane/RoomList.qml b/src/gui/MainPane/RoomList.qml
index 27b8010b..b78f7492 100644
--- a/src/gui/MainPane/RoomList.qml
+++ b/src/gui/MainPane/RoomList.qml
@@ -269,25 +269,19 @@ HListView {
         onActivated: cycleUnreadRooms(true, true) && showItemLimiter.restart()
     }
 
-    Repeater {
+    Instantiator {
         model: Object.keys(window.settings.Keys.Accounts.AtIndex)
-
-        Item {
-            HShortcut {
-                sequences: window.settings.Keys.Accounts.AtIndex[modelData]
-                onActivated: goToAccountNumber(parseInt(modelData, 10) - 1)
-            }
+        delegate: HShortcut {
+            sequences: window.settings.Keys.Accounts.AtIndex[modelData]
+            onActivated: goToAccountNumber(parseInt(modelData, 10) - 1)
         }
     }
 
-    Repeater {
+    Instantiator {
         model: Object.keys(window.settings.Keys.Rooms.AtIndex)
-
-        Item {
-            HShortcut {
-                sequences: window.settings.Keys.Rooms.AtIndex[modelData]
-                onActivated: showAccountRoomAtIndex(parseInt(modelData,10) - 1)
-            }
+        delegate: HShortcut {
+            sequences: window.settings.Keys.Rooms.AtIndex[modelData]
+            onActivated: showAccountRoomAtIndex(parseInt(modelData, 10) - 1)
         }
     }