diff --git a/app/assets/javascripts/admin/addon/templates/customize-colors-show.hbs b/app/assets/javascripts/admin/addon/templates/customize-colors-show.hbs
index e359c1fe67d..eeabe4e5c96 100644
--- a/app/assets/javascripts/admin/addon/templates/customize-colors-show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize-colors-show.hbs
@@ -41,31 +41,34 @@
     <br>
 
     <div class="admin-controls">
-      {{#if model.theme_id}}
-        {{inline-edit-checkbox action=(action "applyUserSelectable") labelKey="admin.customize.theme.color_scheme_user_selectable" checked=model.user_selectable modelId=model.id}}
-      {{else}}
-        <label>
-          {{input type="checkbox" checked=model.user_selectable}}
-          {{i18n "admin.customize.theme.color_scheme_user_selectable"}}
-        </label>
-      {{/if}}
+      {{#unless model.theme_id}}
+        <div class="pull-right">
+          <label>
+            {{input type="checkbox" checked=onlyOverridden}}
+            {{i18n "admin.settings.show_overriden"}}
+          </label>
+        </div>
+      {{/unless}}
+
+      <div>
+        {{#if model.theme_id}}
+          {{inline-edit-checkbox action=(action "applyUserSelectable") labelKey="admin.customize.theme.color_scheme_user_selectable" checked=model.user_selectable modelId=model.id}}
+        {{else}}
+          <label>
+            {{input type="checkbox" checked=model.user_selectable}}
+            {{i18n "admin.customize.theme.color_scheme_user_selectable"}}
+          </label>
+        {{/if}}
+      </div>
     </div>
 
     {{#if colors.length}}
       <table class="table colors">
         <thead>
           <tr>
-            <th>
-            </th>
+            <th></th>
             <th class="hex">{{i18n "admin.customize.color"}}</th>
-            <th class="overriden">
-              {{#unless model.theme_id}}
-                <label>
-                  {{input type="checkbox" checked=onlyOverridden}}
-                  {{i18n "admin.settings.show_overriden"}}
-                </label>
-              {{/unless}}
-            </th>
+            <th></th>
           </tr>
         </thead>
         <tbody>
diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss
index 6845dea807b..24576552ed5 100644
--- a/app/assets/stylesheets/common/admin/customize.scss
+++ b/app/assets/stylesheets/common/admin/customize.scss
@@ -520,6 +520,10 @@
         margin-left: auto;
       }
     }
+
+    .admin-controls {
+      display: block;
+    }
   }
   .colors {
     thead th {