diff --git a/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
index ab744a6ab86..4f6e5342257 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
@@ -64,23 +64,23 @@
           </div>
         </div>
       {{/if}}
-      {{#if this.previewingColorScheme}}
-        {{#if this.previewingColorScheme}}
-          <DButton
-            @action={{action "undoColorSchemePreview"}}
-            @label="user.color_schemes.undo"
-            @icon="undo"
-            @class="btn-default btn-small undo-preview"
-          />
-        {{/if}}
-        <div class="controls color-scheme-checkbox">
-          <PreferenceCheckbox
-            @labelKey="user.color_scheme_default_on_all_devices"
-            @checked={{this.makeColorSchemeDefault}}
-          />
-        </div>
-      {{/if}}
     </div>
+    {{#if this.previewingColorScheme}}
+      {{#if this.previewingColorScheme}}
+        <DButton
+          @action={{action "undoColorSchemePreview"}}
+          @label="user.color_schemes.undo"
+          @icon="undo"
+          @class="btn-default btn-small undo-preview"
+        />
+      {{/if}}
+      <div class="controls color-scheme-checkbox">
+        <PreferenceCheckbox
+          @labelKey="user.color_scheme_default_on_all_devices"
+          @checked={{this.makeColorSchemeDefault}}
+        />
+      </div>
+    {{/if}}
     {{#if this.showDarkColorSchemeSelector}}
       <div class="instructions">
         {{i18n "user.color_schemes.dark_instructions"}}
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index c4b33949557..33bd796fc3e 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -641,7 +641,7 @@
   }
 
   .undo-preview {
-    margin-bottom: 1em;
+    margin: 1em 0;
   }
 
   .save-button {