diff --git a/src/root/jobset-eval.tt b/src/root/jobset-eval.tt
index 6822ed13..67f7fcec 100644
--- a/src/root/jobset-eval.tt
+++ b/src/root/jobset-eval.tt
@@ -33,9 +33,11 @@ c.uri_for(c.controller('JobsetEval').action_for('view'),
 [% END %]
 
 <form>
-  <input name="filter" type="text" class="form-control" type="search" placeholder="Search jobs by name..." [% HTML.attributes(value => filter) %]/>
-  <input name="compare" type="hidden" [% HTML.attributes(value => otherEval.id) %]/>
-  <input name="full" type="hidden" [% HTML.attributes(value => full) %]/>
+  <div class="form-group">
+    <input name="filter" type="text" class="form-control" type="search" placeholder="Search jobs by name..." [% HTML.attributes(value => filter) %]/>
+    <input name="compare" type="hidden" [% HTML.attributes(value => otherEval.id) %]/>
+    <input name="full" type="hidden" [% HTML.attributes(value => full) %]/>
+  </div>
 </form>
 
 <ul class="nav nav-tabs">
diff --git a/src/root/jobset-jobs-tab.tt b/src/root/jobset-jobs-tab.tt
index e38234d2..707d329e 100644
--- a/src/root/jobset-jobs-tab.tt
+++ b/src/root/jobset-jobs-tab.tt
@@ -1,9 +1,9 @@
 [% PROCESS common.tt; USE Math %]
 
 <form id="filter-jobs">
-  <div class="input-group">
+  <div class="form-group input-group">
     <input name="filter" type="search" class="form-control" placeholder="Search jobs by name..." [% HTML.attributes(value => filter) %]/>
-    <div class="input-group-prepend">
+    <div class="input-group-append">
       <button type="button" class="btn btn-info [% IF showInactive %]active[% END %]" id="active-toggle">
         <span class="spinner-border spinner-border-sm" id="filter-loading" style="display:none"/>
         Show inactive jobs