diff --git a/resources/qml/CommunitiesList.qml b/resources/qml/CommunitiesList.qml
index 37a44163..53578cd0 100644
--- a/resources/qml/CommunitiesList.qml
+++ b/resources/qml/CommunitiesList.qml
@@ -5,11 +5,11 @@
 import "./components"
 import "./dialogs"
 import Qt.labs.platform 1.1 as Platform
-import QtQml 2.12
-import QtQuick 2.12
-import QtQuick.Controls 2.5
-import QtQuick.Layouts 1.3
-import im.nheko 1.0
+import QtQml
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import im.nheko
 
 Page {
     id: communitySidebar
@@ -38,6 +38,7 @@ Page {
         anchors.right: parent.right
         height: parent.height
         model: Communities.filtered()
+        boundsBehavior: Flickable.StopAtBounds
 
         ScrollBar.vertical: ScrollBar {
             id: scrollbar
diff --git a/resources/qml/RoomList.qml b/resources/qml/RoomList.qml
index 0c432189..eab6520e 100644
--- a/resources/qml/RoomList.qml
+++ b/resources/qml/RoomList.qml
@@ -6,11 +6,11 @@ import "./components"
 import "./dialogs"
 import "./ui"
 import Qt.labs.platform 1.1 as Platform
-import QtQml 2.12
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.3
-import im.nheko 1.0
+import QtQml
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import im.nheko
 
 Page {
     //leftPadding: Nheko.paddingSmall
@@ -405,6 +405,7 @@ Page {
         anchors.right: parent.right
         height: parent.height
         model: Rooms
+        boundsBehavior: Flickable.StopAtBounds
 
         //reuseItems: true
         ScrollBar.vertical: ScrollBar {