diff --git a/core/client/templates/modals/invite-new-user.hbs b/core/client/templates/modals/invite-new-user.hbs
index 71fac5c827..51df1a8e2c 100644
--- a/core/client/templates/modals/invite-new-user.hbs
+++ b/core/client/templates/modals/invite-new-user.hbs
@@ -7,11 +7,21 @@
                 {{input class="email" id="new-user-email" type="email" placeholder="Email Address" name="email" autofocus="autofocus"
                 autocapitalize="off" autocorrect="off" value=email }}
             </div>
-            <div class="form-group">
+
+            <div class="form-group for-select">
                 <label for="new-user-role">Role</label>
-                {{view Ember.Select content=roles id="new-user-role" optionValuePath="content.id" optionLabelPath="content.name" name="role"
-                value=role}}
+                <span class="gh-select" {{bind-attr data-select-text=selectedRole.name}}>
+                   {{view Ember.Select
+                        content=roles
+                        id="new-user-role"
+                        optionValuePath="content.id"
+                        optionLabelPath="content.name"
+                        name="role"
+                        value=role
+                        selection=selectedRole}}
+                </span>
             </div>
+
         </fieldset>
 
 {{/gh-modal-dialog}}
diff --git a/core/client/templates/settings/general.hbs b/core/client/templates/settings/general.hbs
index 70ace546e2..f4740941a7 100644
--- a/core/client/templates/settings/general.hbs
+++ b/core/client/templates/settings/general.hbs
@@ -3,11 +3,11 @@
 
     <div class="settings-header-inner">
         <button class="button-back">Back</button>
-        
+
         <section class="page-actions">
             <button class="button-save" {{action "save"}}>Save</button>
         </section>
-    </div>    
+    </div>
 </header>
 
 <section class="content settings-general fade-in">
@@ -62,22 +62,25 @@
                 <p>How many posts should be displayed on each page</p>
             </div>
 
-            <div class="form-group">
+            <div class="form-group for-checkbox">
                 <label for="permalinks">Dated Permalinks</label>
                 {{input id="permalinks" name="general[permalinks]" type="checkbox" checked=isDatedPermalinks}}
                 <label class="checkbox" for="permalinks"></label>
                 <p>Include the date in your post URLs</p>
             </div>
 
-            <div class="form-group">
+            <div class="form-group for-select">
                 <label for="activeTheme">Theme</label>
-                {{view Ember.Select
-                        id="activeTheme"
-                        name="general[activeTheme]"
-                        content=themes
-                        optionValuePath="content.name"
-                        optionLabelPath="content.label"
-                        value=activeTheme}}
+                <span class="gh-select" {{bind-attr data-select-text=selectedTheme.label}}>
+                   {{view Ember.Select
+                       id="activeTheme"
+                       name="general[activeTheme]"
+                       content=themes
+                       optionValuePath="content.name"
+                       optionLabelPath="content.label"
+                       value=activeTheme
+                       selection=selectedTheme}}
+               </span>
                 <p>Select a theme for your blog</p>
             </div>