diff --git a/app/gui/SettingsView.qml b/app/gui/SettingsView.qml
index 864db054..b1cabe56 100644
--- a/app/gui/SettingsView.qml
+++ b/app/gui/SettingsView.qml
@@ -446,6 +446,29 @@ Flickable {
 
             }
         }
+
+        GroupBox {
+            id: uiSettingsGroupBox
+            width: (parent.width - 2 * parent.padding)
+            padding: 12
+            title: "<font color=\"skyblue\">UI Settings</font>"
+            font.pointSize: 12
+
+            Column {
+                anchors.fill: parent
+                spacing: 5
+
+                CheckBox {
+                    id: startWindowedCheck
+                    text: "<font color=\"white\">Start Moonlight in windowed mode</font>"
+                    font.pointSize: 12
+                    checked: prefs.startWindowed
+                    onCheckedChanged: {
+                        prefs.startWindowed = checked
+                    }
+                }
+            }
+        }
     }
 
     Column {
@@ -461,7 +484,7 @@ Flickable {
             title: "<font color=\"skyblue\">Input Settings</font>"
             font.pointSize: 12
 
-            Row {
+            Column {
                 anchors.fill: parent
                 spacing: 5
 
@@ -493,29 +516,6 @@ Flickable {
             }
         }
 
-        GroupBox {
-            id: uiSettingsGroupBox
-            width: (parent.width - parent.padding)
-            padding: 12
-            title: "<font color=\"skyblue\">UI Settings</font>"
-            font.pointSize: 12
-
-            Row {
-                anchors.fill: parent
-                spacing: 5
-
-                CheckBox {
-                    id: startWindowedCheck
-                    text: "<font color=\"white\">Start Moonlight in windowed mode</font>"
-                    font.pointSize: 12
-                    checked: prefs.startWindowed
-                    onCheckedChanged: {
-                        prefs.startWindowed = checked
-                    }
-                }
-            }
-        }
-
         GroupBox {
             id: hostSettingsGroupBox
             width: (parent.width - parent.padding)
@@ -523,15 +523,13 @@ Flickable {
             title: "<font color=\"skyblue\">Host Settings</font>"
             font.pointSize: 12
 
-            Row {
+            Column {
                 anchors.fill: parent
                 spacing: 5
 
                 CheckBox {
                     id: optimizeGameSettingsCheck
                     text: "<font color=\"white\">Optimize game settings</font>"
-                    // HACK: Match width of the other checkbox to make the UI not look bad
-                    width: multiControllerCheck.width
                     font.pointSize:  12
                     checked: prefs.gameOptimizations
                     onCheckedChanged: {