diff --git a/app/views/admin/poll/polls/_search_booths.html.erb b/app/views/admin/poll/polls/_search_booths.html.erb
index 56d9cbb12..e4b038e3a 100644
--- a/app/views/admin/poll/polls/_search_booths.html.erb
+++ b/app/views/admin/poll/polls/_search_booths.html.erb
@@ -1,11 +1,9 @@
 <%= form_tag(search_booths_admin_poll_path(@poll), method: :get, remote: true) do |f| %>
-  <div class="row">
-    <div class="small-12 medium-6 column">
-      <%= text_field_tag :search,
-                         @search,
-                         placeholder: t("admin.shared.booths_search.placeholder"), id: "search-booths" %>
-    </div>
-    <div class="form-inline small-12 medium-3 column end">
+  <div class="input-group">
+    <%= text_field_tag :search,
+                       @search,
+                       placeholder: t("admin.shared.booths_search.placeholder"), id: "search-booths" %>
+    <div class="input-group-button">
       <%= submit_tag t("admin.shared.booths_search.button"), class: "button" %>
     </div>
   </div>
diff --git a/app/views/admin/poll/polls/_search_officers.html.erb b/app/views/admin/poll/polls/_search_officers.html.erb
index 45ce9bd8f..53d7c1105 100644
--- a/app/views/admin/poll/polls/_search_officers.html.erb
+++ b/app/views/admin/poll/polls/_search_officers.html.erb
@@ -1,11 +1,9 @@
 <%= form_tag(search_officers_admin_poll_path(@poll), method: :get, remote: true) do |f| %>
-  <div class="row">
-    <div class="small-12 medium-6 column">
-      <%= text_field_tag :search,
-                         @search,
-                         placeholder: t("admin.shared.poll_officers_search.placeholder"), id: "search-officers" %>
-    </div>
-    <div class="form-inline small-12 medium-3 column end">
+  <div class="input-group">
+    <%= text_field_tag :search,
+                       @search,
+                       placeholder: t("admin.shared.poll_officers_search.placeholder"), id: "search-officers" %>
+    <div class="input-group-button">
       <%= submit_tag t("admin.shared.poll_officers_search.button"), class: "button" %>
     </div>
   </div>
diff --git a/app/views/admin/poll/polls/_search_questions.html.erb b/app/views/admin/poll/polls/_search_questions.html.erb
index 0a6123c1b..2f82d82cf 100644
--- a/app/views/admin/poll/polls/_search_questions.html.erb
+++ b/app/views/admin/poll/polls/_search_questions.html.erb
@@ -1,11 +1,10 @@
 <%= form_tag(search_questions_admin_poll_path(@poll), method: :get, remote: true) do |f| %>
-  <div class="row">
-    <div class="small-12 medium-6 column">
-      <%= text_field_tag :search,
-                         @search,
-                         placeholder: t("admin.shared.poll_questions_search.placeholder"), id: "search-questions" %>
-    </div>
-    <div class="form-inline small-12 medium-3 column end">
+  <div class="input-group">
+    <%= text_field_tag :search,
+                       @search,
+                       placeholder: t("admin.shared.poll_questions_search.placeholder"), id: "search-questions" %>
+
+    <div class="input-group-button">
       <%= submit_tag t("admin.shared.poll_questions_search.button"), class: "button" %>
     </div>
   </div>
diff --git a/app/views/admin/poll/polls/show.html.erb b/app/views/admin/poll/polls/show.html.erb
index e357bc7f4..5a59cfa9e 100644
--- a/app/views/admin/poll/polls/show.html.erb
+++ b/app/views/admin/poll/polls/show.html.erb
@@ -11,17 +11,29 @@
   <%= render "filter_subnav" %>
 
   <div class="tabs-panel is-active" id="tab-questions">
-    <%= render "search_questions" %>
+    <div class="row">
+      <div class="small-12 medium-6 column">
+        <%= render "search_questions" %>
+      </div>
+    </div>
     <%= render "questions" %>
   </div>
 
   <div class="tabs-panel" id="tab-booths">
-    <%= render "search_booths" %>
+    <div class="row">
+      <div class="small-12 medium-6 column">
+        <%= render "search_booths" %>
+      </div>
+    </div>
     <%= render "booths" %>
   </div>
 
   <div class="tabs-panel" id="tab-officers">
-    <%= render "search_officers" %>
+    <div class="row">
+      <div class="small-12 medium-6 column">
+        <%= render "search_officers" %>
+      </div>
+    </div>
     <%= render 'officers' %>
   </div>
 </div>
\ No newline at end of file