diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index 27ec940d3fb..777d5665336 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -87,6 +87,7 @@
     }
 
     .btn-clear {
+      margin-left: 0.25em;
       padding: 0.25em;
       border: 0;
       background: none;
diff --git a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
index 00b7f8f6208..6eda7b490de 100644
--- a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
+++ b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
@@ -87,9 +87,9 @@ export default Controller.extend({
 
   @discourseComputed("site.groups")
   siteGroups(groups) {
-    const values = [{ name: "", value: null }];
-    groups.forEach(g => values.push({ name: g.name, value: g.name }));
-    return values;
+    return groups.map(g => {
+      return { name: g.name, value: g.name };
+    });
   },
 
   @discourseComputed("pollType", "regularPollType")
diff --git a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
index b4303bbe92f..e04aebbd8af 100644
--- a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
+++ b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
@@ -26,6 +26,7 @@
         <label class="input-group-label">{{i18n 'poll.ui_builder.poll_groups.label'}}</label>
         {{combo-box content=siteGroups
                     value=pollGroups
+                    options=(hash clearable=true)
                     valueAttribute="value"}}
       </div>