diff --git a/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs b/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs
index f51b9fbb..6866f3ef 100644
--- a/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs
@@ -19,7 +19,7 @@
   <div class="setting-label">
     <label>{{i18n "admin.wizard.field.required"}}</label>
   </div>
-  
+
   <div class="setting-value">
     <span>{{i18n "admin.wizard.field.required_label"}}</span>
     {{input type="checkbox" checked=field.required}}
@@ -54,7 +54,7 @@
   <div class="setting-label">
     <label>{{i18n "admin.wizard.type"}}</label>
   </div>
-  
+
   <div class="setting-value">
     {{combo-box
       value=field.type
@@ -216,7 +216,9 @@
 
     <div class="setting-value">
       {{tag-group-chooser
+        id=(concat field.id "-tag-groups")
         tagGroups=field.tag_groups
+        onChange=(action (mut field.tag_groups))
       }}
     </div>
   </div>
@@ -257,7 +259,7 @@
           <div class="setting-label">
             <label>{{i18n "admin.wizard.field.property"}}</label>
           </div>
-          
+
           <div class="setting-value">
             {{combo-box
               value=field.property
diff --git a/assets/stylesheets/wizard/wizard_custom.scss b/assets/stylesheets/wizard/wizard_custom.scss
index 659c97f5..6c91385f 100644
--- a/assets/stylesheets/wizard/wizard_custom.scss
+++ b/assets/stylesheets/wizard/wizard_custom.scss
@@ -1,5 +1,6 @@
 @import "common/foundation/colors";
 @import "common/foundation/variables";
+@import "common/foundation/base";
 @import "common/base/code_highlighting";
 @import "common/base/modal";
 @import "common/base/onebox";