diff --git a/app/assets/javascripts/admin/models/site_customization.js b/app/assets/javascripts/admin/models/site_customization.js
index 93799f33ef0..a42dbf6ff31 100644
--- a/app/assets/javascripts/admin/models/site_customization.js
+++ b/app/assets/javascripts/admin/models/site_customization.js
@@ -70,7 +70,10 @@ Discourse.SiteCustomization = Discourse.Model.extend({
       data: { site_customization: data },
       type: this.id ? 'PUT' : 'POST'
     }).then(function (result) {
-      if (!siteCustomization.id) { siteCustomization.set('id', result.id); }
+      if (!siteCustomization.id) {
+        siteCustomization.set('id', result.id);
+        siteCustomization.set('key', result.key);
+      }
       siteCustomization.set('savingStatus', Em.String.i18n('saved'));
       siteCustomization.set('saving',false);
       siteCustomization.startTrackingChanges();
diff --git a/app/assets/javascripts/admin/templates/customize.js.handlebars b/app/assets/javascripts/admin/templates/customize.js.handlebars
index 85e5dae271c..6a32ccee663 100644
--- a/app/assets/javascripts/admin/templates/customize.js.handlebars
+++ b/app/assets/javascripts/admin/templates/customize.js.handlebars
@@ -29,7 +29,7 @@
       {{aceEditor content=header mode="html"}}
     {{/if}}
     {{#if view.stylesheetActive}}
-      {{aceEditor content=stylesheet mode="css"}}
+      {{aceEditor content=stylesheet mode="scss"}}
     {{/if}}
   {{/with}}
   <br>
diff --git a/app/assets/stylesheets/admin/admin_base.scss b/app/assets/stylesheets/admin/admin_base.scss
index 019fcca3cbc..a6a4b4a8c5e 100644
--- a/app/assets/stylesheets/admin/admin_base.scss
+++ b/app/assets/stylesheets/admin/admin_base.scss
@@ -218,10 +218,7 @@ table {
     float: left;
   }
   .content-list ul {
-    min-height: 700px;
-  }
-  a {
-    cursor: pointer;
+    margin-bottom: 10px;
   }
   .current-style {
     .delete-link {
@@ -240,7 +237,7 @@ table {
     }
     .ace-wrapper {
       position: relative;
-      height: 600px;
+      height: 400px;
       width: 100%;
     }
     .ace_editor {
@@ -252,6 +249,7 @@ table {
     }
     .status-actions {
       float: right;
+      margin-top: 7px;
       span {
         margin-right: 20px;
       }
@@ -259,9 +257,6 @@ table {
     .buttons {
       float: left;
       width: 200px;
-      button, a , span{
-        float: left;
-      }
       .saving {
         padding: 5px 0 0 0;
         margin-left: 10px;