diff --git a/src/kcm/package/contents/ui/Advanced.qml b/src/kcm/package/contents/ui/Advanced.qml
--- a/src/kcm/package/contents/ui/Advanced.qml
+++ b/src/kcm/package/contents/ui/Advanced.qml
@@ -29,19 +29,12 @@
 ScrollView {
     id: scrollView
 
-    contentWidth: contentLayout.width
-    contentHeight: contentLayout.height
-    clip: true
+    // TODO Fix content width, and Remove policy.
+    ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
 
     ColumnLayout {
         id: contentLayout
-
-        Component.onCompleted: {
-            // Normal binding causes binding loops
-            width = Qt.binding(function() {
-                return scrollView.width;
-            });
-        }
+        width: scrollView.availableWidth
 
         Header {
             Layout.fillWidth: true
@@ -148,7 +141,7 @@
             id: grid
             columns: 3
             spacing: 5
-            Layout.fillWidth: true
+            Layout.preferredWidth: parent.width
 
             Item {
                 width: grid.width/3
diff --git a/src/kcm/package/contents/ui/Applications.qml b/src/kcm/package/contents/ui/Applications.qml
--- a/src/kcm/package/contents/ui/Applications.qml
+++ b/src/kcm/package/contents/ui/Applications.qml
@@ -29,19 +29,9 @@
 ScrollView {
     id: scrollView
 
-    contentWidth: contentLayout.width
-    contentHeight: contentLayout.height
-    clip: true
-
     ColumnLayout {
         id: contentLayout
-
-        Component.onCompleted: {
-            // Normal binding causes binding loops
-            width = Qt.binding(function() {
-                return scrollView.width;
-            });
-        }
+        width: scrollView.availableWidth
 
         Header {
             Layout.fillWidth: true
diff --git a/src/kcm/package/contents/ui/Devices.qml b/src/kcm/package/contents/ui/Devices.qml
--- a/src/kcm/package/contents/ui/Devices.qml
+++ b/src/kcm/package/contents/ui/Devices.qml
@@ -26,19 +26,9 @@
 ScrollView {
     id: scrollView
 
-    contentWidth: contentLayout.width
-    contentHeight: contentLayout.height
-    clip: true
-
     ColumnLayout {
         id: contentLayout
-
-        Component.onCompleted: {
-            // Normal binding causes binding loops
-            width = Qt.binding(function() {
-                return scrollView.width;
-            });
-        }
+        width: scrollView.availableWidth
 
         Header {
             Layout.fillWidth: true