diff --git a/plugins/poll/assets/javascripts/discourse/templates/modals/poll-ui-builder.hbs b/plugins/poll/assets/javascripts/discourse/templates/modals/poll-ui-builder.hbs
index bdb14b28528..5177357ab90 100644
--- a/plugins/poll/assets/javascripts/discourse/templates/modals/poll-ui-builder.hbs
+++ b/plugins/poll/assets/javascripts/discourse/templates/modals/poll-ui-builder.hbs
@@ -11,29 +11,36 @@
                   value=pollType
                   valueAttribute="value"
                   none="poll.ui_builder.poll_type.regular"}}
+    </div>
 
-      {{#if showMinMax}}
-        <label>{{i18n 'poll.ui_builder.poll_config.min'}}</label>
+    {{#if showMinMax}}
+      <div class="input-group">
+        <label class="input-group-label">{{i18n 'poll.ui_builder.poll_config.min'}}</label>
         {{combo-box content=pollMinOptions
                     value=pollMin
                     valueAttribute="value"
                     class="poll-options-min"}}
+      </div>
 
-        <label>{{i18n 'poll.ui_builder.poll_config.max'}}</label>
+
+      <div class="input-group">
+        <label class="input-group-label">{{i18n 'poll.ui_builder.poll_config.max'}}</label>
         {{combo-box content=pollMaxOptions
                     value=pollMax
                     valueAttribute="value"
                     class="poll-options-max"}}
+      </div>
 
-        {{#if isNumber}}
-          <label>{{i18n 'poll.ui_builder.poll_config.step'}}</label>
+      {{#if isNumber}}
+        <div class="input-group">
+          <label class="input-group-label">{{i18n 'poll.ui_builder.poll_config.step'}}</label>
           {{combo-box content=pollStepOptions
                       value=pollStep
                       valueAttribute="value"
                       class="poll-options-step"}}
-        {{/if}}
+        </div>
       {{/if}}
-    </div>
+    {{/if}}
 
     <div class="input-group">
       <label>