diff --git a/app/components/form-user-labels/component.js b/app/components/form-user-labels/component.js
index 80b7bd032..cb56db982 100644
--- a/app/components/form-user-labels/component.js
+++ b/app/components/form-user-labels/component.js
@@ -20,7 +20,7 @@ export default Ember.Component.extend(ManageLabels, {
 
         this.$('INPUT.key').last()[0].focus();
       });
-    }
+    },
   },
 
   didReceiveAttrs() {
@@ -31,6 +31,7 @@ export default Ember.Component.extend(ManageLabels, {
     }
   },
 
+
   init() {
     this._super(...arguments);
 
diff --git a/app/templates/host/add-options.hbs b/app/templates/host/add-options.hbs
index ce38f3b36..f67e4cd87 100644
--- a/app/templates/host/add-options.hbs
+++ b/app/templates/host/add-options.hbs
@@ -7,7 +7,7 @@
     <label>{{t 'hostPartial.host.addOptions.labels'}}</label>
   </div>
   <div class="col span-10">
-    {{form-user-labels initialLabels=model.labels setLabels=(action 'setLabels')}}
+    {{form-user-labels initialLabels=model.labels setLabels=(action 'setLabels') expandAll=null}}
   </div>
 </div>