diff --git a/src/gui/MainPane/AccountRoomsList.qml b/src/gui/MainPane/AccountRoomsList.qml
index 59dd2f30..9236ed8c 100644
--- a/src/gui/MainPane/AccountRoomsList.qml
+++ b/src/gui/MainPane/AccountRoomsList.qml
@@ -43,15 +43,18 @@ HListView {
             property: "contentY"
             value: Math.max(
                 0,
-                Math.min(
-                    mainPaneList.contentHeight - mainPaneList.height,
-                    highlightRectangle.y + highlightRectangle.height / 2 -
-                    mainPaneList.height / 2,
-                ),
+                highlightRectangle.y + highlightRectangle.height / 2 -
+                mainPaneList.height / 2,
             )
             delayed: true
             when: yAnimation.running
         }
+
+        Connections {
+            target: mainPaneList
+            enabled: yAnimation.running
+            onContentYChanged: mainPaneList.returnToBounds()
+        }
     }