diff --git a/src/iSponsorBlockTV/setup-wizard-style.tcss b/src/iSponsorBlockTV/setup-wizard-style.tcss
index e6dd886..e10f091 100644
--- a/src/iSponsorBlockTV/setup-wizard-style.tcss
+++ b/src/iSponsorBlockTV/setup-wizard-style.tcss
@@ -363,3 +363,9 @@ MigrationScreen {
     width: 1fr;
     content-align: center middle;
 }
+
+/* Autoplay */
+#autoplay-container{
+    padding: 1;
+    height: auto;
+}
\ No newline at end of file
diff --git a/src/iSponsorBlockTV/setup_wizard.py b/src/iSponsorBlockTV/setup_wizard.py
index 083d062..669c581 100644
--- a/src/iSponsorBlockTV/setup_wizard.py
+++ b/src/iSponsorBlockTV/setup_wizard.py
@@ -864,11 +864,12 @@ class AutoPlayManager(Vertical):
             classes="subtitle",
             id="autoplay-subtitle",
         )
-        yield Checkbox(
-            value=self.config.auto_play,
-            id="autoplay-switch",
-            label="Enable autoplay",
-        )
+        with Horizontal(id="autoplay-container"):
+            yield Checkbox(
+                value=self.config.auto_play,
+                id="autoplay-switch",
+                label="Enable autoplay",
+            )
 
     @on(Checkbox.Changed, "#autoplay-switch")
     def changed_skip(self, event: Checkbox.Changed):