diff --git a/qml/pages/MainPage.qml b/qml/pages/MainPage.qml
index 2baeb20..8debb45 100644
--- a/qml/pages/MainPage.qml
+++ b/qml/pages/MainPage.qml
@@ -10,17 +10,17 @@ DPage {
 
   Component.onCompleted: HomePlaylistsModel.load()
 
-  ScrollView {
+  Flickable {
     id: _scroll
     anchors.fill: parent
     clip: true
-    leftPadding: 25
-    bottomPadding: 25
-    rightPadding: 25
-    topPadding: 25
+    leftMargin: 25
+    bottomMargin: 25
+    rightMargin: 25
+    topMargin: 25
 
-    ScrollBar.vertical.policy: ScrollBar.AlwaysOff
-    ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
+    contentWidth: root.width - 50
+    contentHeight: _layout.height
 
     MouseArea {
       width: root.width
diff --git a/qml/pages/SettingsPage.qml b/qml/pages/SettingsPage.qml
index e36a88a..f8c5fa9 100644
--- a/qml/pages/SettingsPage.qml
+++ b/qml/pages/SettingsPage.qml
@@ -10,17 +10,15 @@ DPage {
   id: root
   property real scroll: 0
 
-  ScrollView {
+  Flickable {
     id: _scroll
     anchors.fill: parent
     clip: true
-    leftPadding: 10
-    bottomPadding: 10
-    rightPadding: 10
-    topPadding: _label.visible? 30 : 10
+    bottomMargin: 10
+    topMargin: _label.visible? 30 : 10
 
-    ScrollBar.vertical.policy: ScrollBar.AlwaysOff
-    ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
+    contentWidth: root.width
+    contentHeight: _layout.height
 
     MouseArea {
       width: root.width