diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
index 9eb252d68b..681b8e84df 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
@@ -95,7 +95,11 @@
         <label for="whole_record">Search entire MARC record</label>
     [% END %]
     [% FOREACH search_box IN search_boxes_loop %]
-        [% IF ( search_boxes_label ) %]<div style="text-indent: 4.5em;">[% ELSE %]<div>[% END %]
+        [% IF ( search_boxes_label ) %]
+        <div class="search_set" style="text-indent: 4.5em;">
+        [% ELSE %]
+        <div class="search_set">
+        [% END %]
 			[% IF ( expanded_options ) %]
             [% IF ( search_box.boolean ) %]
                 <select name="op">
diff --git a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
index 16ef051fba..0c0be5295b 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
@@ -131,6 +131,17 @@ $.fn.selectTabByID = function (tabID) {
     /* Search results browsing */
     /* forms with action leading to search */
     $("form[action*='search.pl']").submit(function(){
+        var removedPrior = false;
+        $(".search_set").each(function(){
+            if( removedPrior ){
+                $(this).find('select[name="op"]').remove();
+                removedPrior = false;
+            }
+            if( $(this).find('input[name="q"]').val() == "" ){
+                $(this).remove();
+                removedPrior = true;
+            }
+        });
         resetSearchContext();
     });
     /* any link to launch a search except navigation links */