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 aaf375e6d95..04eb9a61ea3 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
@@ -1,6 +1,6 @@
 {{#d-modal-body title="poll.ui_builder.title" class="poll-ui-builder"}}
   <form class="poll-ui-builder-form form-horizontal">
-    <div class="input-group">
+    <div class="input-group poll-select">
       <label class="input-group-label">{{i18n 'poll.ui_builder.poll_type.label'}}</label>
       {{combo-box content=pollTypes
                   value=pollType
@@ -9,17 +9,17 @@
     </div>
 
     {{#if showMinMax}}
-      <div class="input-group">
+      <div class="input-group poll-number">
+        {{input-tip validation=minMaxValueValidation}}
         <label class="input-group-label">{{i18n 'poll.ui_builder.poll_config.min'}}</label>
         {{input type='number'
                 value=pollMin
                 valueAttribute="value"
                 class="poll-options-min"}}
-        {{input-tip validation=minMaxValueValidation}}
       </div>
 
 
-      <div class="input-group">
+      <div class="input-group poll-number">
         <label class="input-group-label">{{i18n 'poll.ui_builder.poll_config.max'}}</label>
         {{input type='number'
                 value=pollMax
@@ -28,7 +28,7 @@
       </div>
 
       {{#if isNumber}}
-        <div class="input-group">
+        <div class="input-group poll-number">
           <label class="input-group-label">{{i18n 'poll.ui_builder.poll_config.step'}}</label>
           {{input type='number'
                   value=pollStep
@@ -41,21 +41,21 @@
     {{/if}}
 
     {{#unless isNumber}}
-      <div class="input-group">
+      <div class="input-group poll-textarea">
         <label>{{i18n 'poll.ui_builder.poll_options.label'}}</label>
-        {{input-tip validation=minNumOfOptionsValidation}}
         {{textarea value=pollOptions}}
+        {{input-tip validation=minNumOfOptionsValidation}}
       </div>
     {{/unless}}
 
-    <div class="input-group">
+    <div class="input-group poll-checkbox">
       <label>
         {{input type='checkbox' checked=publicPoll}}
         {{i18n "poll.ui_builder.poll_public.label"}}
       </label>
     </div>
 
-    <div class="input-group">
+    <div class="input-group poll-checkbox">
       <label>
         {{input type="checkbox" checked=autoClose}}
         {{i18n "poll.ui_builder.automatic_close.label"}}