diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/button/SurfaceRow.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/button/SurfaceRow.kt
index 4bd1ae64..fd70e8b7 100644
--- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/button/SurfaceRow.kt
+++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/button/SurfaceRow.kt
@@ -122,13 +122,14 @@ fun SurfaceRow(
                         description()
                     }
                 }
-            }
-            if (trailing != null) {
-                trailing(
-                    Modifier.focusRequester(trailingFocusRequester).focusProperties {
-                        left = mainFocusRequester
-                    }
-                )
+                Spacer(Modifier.weight(1f))
+                if (trailing != null) {
+                    trailing(
+                        Modifier.focusRequester(trailingFocusRequester).focusProperties {
+                            left = mainFocusRequester
+                        }
+                    )
+                }
             }
         }
         if (expandedContent != null) {