diff --git a/MiddlePanel.qml b/MiddlePanel.qml
index 3cc2163f..b4c56af8 100644
--- a/MiddlePanel.qml
+++ b/MiddlePanel.qml
@@ -141,7 +141,7 @@ Rectangle {
             }, State {
                 name: "Settings"
                PropertyChanges { target: root; currentView: settingsView }
-               PropertyChanges { target: mainFlickable; contentHeight: 2000 * scaleRatio }
+               PropertyChanges { target: mainFlickable; contentHeight: settingsView.settingsHeight + 100 }
             }, State {
                 name: "Mining"
                 PropertyChanges { target: root; currentView: miningView }
diff --git a/pages/Settings.qml b/pages/Settings.qml
index 7c0a9bb5..2acc8110 100644
--- a/pages/Settings.qml
+++ b/pages/Settings.qml
@@ -39,6 +39,7 @@ import moneroComponents.Clipboard 1.0
 
 Rectangle {
     property bool viewOnly: false
+    property alias settingsHeight: mainLayout.height
     id: page
 
     color: "transparent"