diff --git a/kcmkwin/kwindesktop/package/contents/ui/main.qml b/kcmkwin/kwindesktop/package/contents/ui/main.qml
--- a/kcmkwin/kwindesktop/package/contents/ui/main.qml
+++ b/kcmkwin/kwindesktop/package/contents/ui/main.qml
@@ -174,123 +174,119 @@
         }
     }
 
-    footer: ColumnLayout {
-        Kirigami.FormLayout {
-            anchors.horizontalCenter: parent.horizontalCenter
+    footer: Kirigami.FormLayout {
+        Connections {
+            target: kcm
 
-            Connections {
-                target: kcm
+            onNavWrapsChanged: navWraps.checked = kcm.navWraps
 
-                onNavWrapsChanged: navWraps.checked = kcm.navWraps
-
-                onOsdEnabledChanged: osdEnabled.checked = kcm.osdEnabled
-                onOsdDurationChanged: osdDuration.value = kcm.osdDuration
-                onOsdTextOnlyChanged: osdTextOnly.checked = !kcm.osdTextOnly
-            }
-
-            QtControls.CheckBox {
-                id: navWraps
+            onOsdEnabledChanged: osdEnabled.checked = kcm.osdEnabled
+            onOsdDurationChanged: osdDuration.value = kcm.osdDuration
+            onOsdTextOnlyChanged: osdTextOnly.checked = !kcm.osdTextOnly
+        }
 
-                Kirigami.FormData.label: i18n("Options:")
+        QtControls.CheckBox {
+            id: navWraps
 
-                text: i18n("Navigation wraps around")
+            Kirigami.FormData.label: i18n("Options:")
 
-                checked: kcm.navWraps
+            text: i18n("Navigation wraps around")
 
-                onCheckedChanged: kcm.navWraps = checked
-            }
+            checked: kcm.navWraps
 
-            RowLayout {
-                Layout.fillWidth: true
+            onCheckedChanged: kcm.navWraps = checked
+        }
 
-                QtControls.CheckBox {
-                    id: animationEnabled
+        RowLayout {
+            Layout.fillWidth: true
 
-                    text: i18n("Show animation when switching:")
+            QtControls.CheckBox {
+                id: animationEnabled
 
-                    checked: kcm.animationsModel.enabled
+                text: i18n("Show animation when switching:")
 
-                    onCheckedChanged: kcm.animationsModel.enabled = checked
-                }
+                checked: kcm.animationsModel.enabled
 
-                QtControls.ComboBox {
-                    enabled: animationEnabled.checked
+                onCheckedChanged: kcm.animationsModel.enabled = checked
+            }
 
-                    model: kcm.animationsModel
-                    textRole: "NameRole"
-                    currentIndex: kcm.animationsModel.currentIndex
-                    onActivated: kcm.animationsModel.currentIndex = currentIndex
-                }
+            QtControls.ComboBox {
+                enabled: animationEnabled.checked
 
-                QtControls.Button {
-                    enabled: animationEnabled.checked && kcm.animationsModel.currentConfigurable
+                model: kcm.animationsModel
+                textRole: "NameRole"
+                currentIndex: kcm.animationsModel.currentIndex
+                onActivated: kcm.animationsModel.currentIndex = currentIndex
+            }
 
-                    icon.name: "configure"
+            QtControls.Button {
+                enabled: animationEnabled.checked && kcm.animationsModel.currentConfigurable
 
-                    onClicked: kcm.configureAnimation()
-                }
+                icon.name: "configure"
 
-                QtControls.Button {
-                    enabled: animationEnabled.checked
+                onClicked: kcm.configureAnimation()
+            }
 
-                    icon.name: "dialog-information"
+            QtControls.Button {
+                enabled: animationEnabled.checked
 
-                    onClicked: kcm.showAboutAnimation()
-                }
+                icon.name: "dialog-information"
 
-                Item {
-                    Layout.fillWidth: true
-                }
+                onClicked: kcm.showAboutAnimation()
             }
 
-            RowLayout {
+            Item {
                 Layout.fillWidth: true
+            }
+        }
+
+        RowLayout {
+            Layout.fillWidth: true
 
-                QtControls.CheckBox {
-                    id: osdEnabled
+            QtControls.CheckBox {
+                id: osdEnabled
 
-                    text: i18n("Show on-screen display when switching:")
+                text: i18n("Show on-screen display when switching:")
 
-                    checked: kcm.osdEnabled
+                checked: kcm.osdEnabled
 
-                    onToggled: kcm.osdEnabled = checked
-                }
+                onToggled: kcm.osdEnabled = checked
+            }
 
-                QtControls.SpinBox {
-                    id: osdDuration
+            QtControls.SpinBox {
+                id: osdDuration
 
-                    enabled: osdEnabled.checked
+                enabled: osdEnabled.checked
 
-                    from: 0
-                    to: 10000
-                    stepSize: 100
+                from: 0
+                to: 10000
+                stepSize: 100
 
-                    textFromValue: function(value, locale) { return i18n("%1 ms", value)}
+                textFromValue: function(value, locale) { return i18n("%1 ms", value)}
 
-                    value: kcm.osdDuration
+                value: kcm.osdDuration
 
-                    onValueChanged: kcm.osdDuration = value
-                }
+                onValueChanged: kcm.osdDuration = value
             }
+        }
 
-            RowLayout {
-                Layout.fillWidth: true
+        RowLayout {
+            Layout.fillWidth: true
 
-                Item {
-                    width: units.largeSpacing
-                }
+            Item {
+                width: units.largeSpacing
+            }
 
-                QtControls.CheckBox {
-                    id: osdTextOnly
+            QtControls.CheckBox {
+                id: osdTextOnly
 
-                    enabled: osdEnabled.checked
+                enabled: osdEnabled.checked
 
-                    text: i18n("Show desktop layout indicators")
+                text: i18n("Show desktop layout indicators")
 
-                    checked: !kcm.osdTextOnly
+                checked: !kcm.osdTextOnly
 
-                    onToggled: kcm.osdTextOnly = !checked
-                }
+                onToggled: kcm.osdTextOnly = !checked
             }
         }
     }