diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml
index 9bb99f23cf..31c2638756 100644
--- a/resources/qml/Preferences/GeneralPage.qml
+++ b/resources/qml/Preferences/GeneralPage.qml
@@ -148,6 +148,14 @@ UM.PreferencesPage
                 bottom: parent.bottom
                 right: parent.right
             }
+
+            onPositionChanged: {
+                // This removes focus from items when scrolling.
+                // This fixes comboboxes staying open and scrolling container
+                if (!activeFocus) {
+                    forceActiveFocus();
+                }
+            }
         }
 
         Column
diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml
index 53706d6fbe..ccc490e88a 100644
--- a/resources/qml/Settings/SettingView.qml
+++ b/resources/qml/Settings/SettingView.qml
@@ -191,13 +191,15 @@ Item
         }
         clip: true
         cacheBuffer: 1000000   // Set a large cache to effectively just cache every list item.
-        ScrollBar.vertical: UM.ScrollBar { id: scrollBar }
-
-        onContentYChanged: {
-        // This removes focus from SettingItems when scrolling.
-        // This fixes comboboxes staying open and scrolling out of the settingView.
-            if (!scrollBar.activeFocus) {
-                scrollBar.forceActiveFocus();
+        ScrollBar.vertical: UM.ScrollBar
+        {
+            id: scrollBar
+            onPositionChanged: {
+                // This removes focus from items when scrolling.
+                // This fixes comboboxes staying open and scrolling container
+                if (!activeFocus) {
+                    forceActiveFocus();
+                }
             }
         }