diff --git a/src/commoncomponents/ListViewJami.qml b/src/commoncomponents/ListViewJami.qml
index 926555ad3f3943c2d11fe41ff9643a2fd1dbfcda..2ad1f62f1f1fec8f96e8bdb2e1442261be0d9bdb 100644
--- a/src/commoncomponents/ListViewJami.qml
+++ b/src/commoncomponents/ListViewJami.qml
@@ -44,6 +44,7 @@ Rectangle {
         visible: listViewBackground.visible
         layer.mipmap: false
         clip: true
+        maximumFlickVelocity: 1024
 
         ScrollIndicator.vertical: ScrollIndicator {}
     }
diff --git a/src/mainview/components/ConversationSmartListView.qml b/src/mainview/components/ConversationSmartListView.qml
index 7fc6dad12877958c04eb6b9002ea58ad7c358cf8..a4f4dda5a28f64ec466b0594647854b174b499cc 100644
--- a/src/mainview/components/ConversationSmartListView.qml
+++ b/src/mainview/components/ConversationSmartListView.qml
@@ -89,6 +89,7 @@ ListView {
     }
 
     clip: true
+    maximumFlickVelocity: 1024
 
     delegate: ConversationSmartListViewItemDelegate {
         id: smartListItemDelegate
diff --git a/src/settingsview/SettingsView.qml b/src/settingsview/SettingsView.qml
index 4ac5b063a8ccdcfc9d439c9c8c0e56ae1f97c661..775f581f77cb788e9674f3139ca7e10de01e3f42 100644
--- a/src/settingsview/SettingsView.qml
+++ b/src/settingsview/SettingsView.qml
@@ -162,19 +162,17 @@ Rectangle {
             onBackArrowClicked: root.settingsBackArrowClicked()
         }
 
-        ScrollView {
+        Flickable {
             id: settingsViewScrollView
 
-            property ScrollBar vScrollBar: ScrollBar.vertical
-
             anchors.top: settingsHeader.bottom
             anchors.horizontalCenter: settingsViewRect.horizontalCenter
 
             height: settingsViewRect.height - settingsHeader.height
             width: settingsViewRect.width
 
-            ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
-            ScrollBar.vertical.policy: ScrollBar.AsNeeded
+            maximumFlickVelocity: 1024
+            ScrollIndicator.vertical: ScrollIndicator {}
 
             clip: true
             contentHeight: rightSettingsStackLayout.height
@@ -231,10 +229,9 @@ Rectangle {
 
                     onAdvancedSettingsToggled: {
                         if (settingsVisible)
-                            settingsViewScrollView.vScrollBar.position =
-                                    getAdvancedSettingsScrollPosition()
+                            settingsViewScrollView.contentY = getAdvancedSettingsScrollPosition()
                         else
-                            settingsViewScrollView.vScrollBar.position = 0
+                            settingsViewScrollView.contentY = 0
                     }
                 }
 
diff --git a/src/settingsview/components/CurrentAccountSettings.qml b/src/settingsview/components/CurrentAccountSettings.qml
index cb8bc785336a3361ce662cc85eb19d2613de7c52..457814ad3bf937d074eb5121d6cb39210e4fcbd3 100644
--- a/src/settingsview/components/CurrentAccountSettings.qml
+++ b/src/settingsview/components/CurrentAccountSettings.qml
@@ -85,7 +85,7 @@ Rectangle {
     }
 
     function getAdvancedSettingsScrollPosition() {
-        return advancedSettings.y / root.height
+        return advancedSettings.y
     }
 
     function setPasswordButtonText() {
diff --git a/src/settingsview/components/PluginListPreferencesView.qml b/src/settingsview/components/PluginListPreferencesView.qml
index e22596ca38493311749c35ca7f99bd0ac5004705..3fffe87509913a90dbd260cc433f66b19385519b 100644
--- a/src/settingsview/components/PluginListPreferencesView.qml
+++ b/src/settingsview/components/PluginListPreferencesView.qml
@@ -276,6 +276,7 @@ Rectangle {
 
                     model: PluginAdapter.getPluginPreferencesModel(root.pluginId, root.category)
                     interactive: false
+                    maximumFlickVelocity: 1024
 
                     delegate: PreferenceItemDelegate {
                         id: preferenceItemDelegateCategory
@@ -325,6 +326,7 @@ Rectangle {
 
             model: PluginAdapter.getPluginPreferencesModel(root.pluginId)
             interactive: false
+            maximumFlickVelocity: 1024
 
             delegate: PreferenceItemDelegate {
                 id: preferenceItemDelegate
diff --git a/src/settingsview/components/PluginListSettingsView.qml b/src/settingsview/components/PluginListSettingsView.qml
index 95e303401727b59d8708ef794d3377a9bd4f7b34..07b31c63305237f445d7ce99f4885f832bd686b9 100644
--- a/src/settingsview/components/PluginListSettingsView.qml
+++ b/src/settingsview/components/PluginListSettingsView.qml
@@ -124,6 +124,7 @@ Rectangle {
             Layout.bottomMargin: 10
 
             model: PluginAdapter.getPluginSelectableModel()
+            maximumFlickVelocity: 1024
 
             delegate: PluginItemDelegate {
                 id: pluginItemDelegate