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 681b8e84df..e3fe038f0b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
@@ -96,9 +96,9 @@
     [% END %]
     [% FOREACH search_box IN search_boxes_loop %]
         [% IF ( search_boxes_label ) %]
-        <div class="search_set" style="text-indent: 4.5em;">
+        <div class="search-term-row" style="text-indent: 4.5em;">
         [% ELSE %]
-        <div class="search_set">
+        <div class="search-term-row">
         [% END %]
 			[% IF ( expanded_options ) %]
             [% IF ( search_box.boolean ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
index da4354e751..375dd4999f 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
@@ -131,8 +131,13 @@ $.fn.selectTabByID = function (tabID) {
     /* Search results browsing */
     /* forms with action leading to search */
     $("form[action*='search.pl']").submit(function(){
+        $('[name^="limit"]').each(function(){
+            if( $(this).val() == '' ){
+                $(this).prop("disabled","disabled");
+            }
+        });
         var disabledPrior = false;
-        $(".search_set").each(function(){
+        $(".search-term-row").each(function(){
             if( disabledPrior ){
                 $(this).find('select[name="op"]').prop("disabled","disabled");
                 disabledPrior = false;
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
index f1b4e6dba2..08b8889382 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
@@ -444,6 +444,18 @@ $(document).ready(function() {
         jQuery.removeCookie("search_path_code", { path: '/'});
     [% END %]
     $('#advsearch form').submit(function() {
+        $('[name^="limit"]').each(function(){
+            if( $(this).val() == '' ){
+                $(this).prop("disabled","disabled");
+            }
+        });
+        $(".search-term-row").each(function(){
+            if( $(this).find('input[name="q"]').val() == "" ){
+                $(this).find('input[name="q"]').prop("disabled","disabled");
+                $(this).find('select[name="op"]').prop("disabled","disabled");
+                $(this).find('select[name="idx"]').prop("disabled","disabled");
+            }
+        });
         form_serialized = $(this).serialize();
         jQuery.cookie("form_serialized", form_serialized,{ path: '/'});
         form_serialized_limits = [