diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
index e79843fbc1..bb7d80c53a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
@@ -139,7 +139,10 @@ tr.selected td {
 
 <div class="row">
     <div class="col-md-12">
-    <fieldset class="action"><input type="submit" class="btn btn-primary" value="Search" /> <a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Cancel</a></fieldset>
+        <fieldset class="action">
+            <input type="submit" id="submit_z3950_search" class="btn btn-primary" value="Search" />
+            <a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Cancel</a>
+        </fieldset>
     </div>
 </div>
 </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt
index 7bf4cfa9b9..1fdc18df28 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt
@@ -68,7 +68,8 @@
             </div>
             <nav class="navbar navbar-default navbar-fixed-bottom">
                 <div class="container-fluid">
-                     <fieldset class="action"><input type="submit" class="btn btn-primary" value="Search" /> <a class="cancel close" href="#">Cancel</a></fieldset>
+                     <fieldset class="action"><input type="submit" id="submit_z3950_search" class="btn btn-primary" value="Search" />
+                     <a class="cancel close" href="#">Cancel</a></fieldset>
                 </div>
             </nav>
         </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
index e2a5d4141c..7a44d5644c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
@@ -108,7 +108,10 @@
 
                 <nav class="navbar navbar-default navbar-fixed-bottom">
                     <div class="container-fluid">
-                        <fieldset class="action"><input type="submit" class="btn btn-primary" value="Search" /> <a class="cancel close" href="#">Cancel</a></fieldset>
+                        <fieldset class="action">
+                            <input type="submit" id="submit_z3950_search" class="btn btn-primary" value="Search" />
+                            <a class="cancel close" href="#">Cancel</a>
+                        </fieldset>
                     </div>
                 </nav>
             </form> <!-- /.checkboxed -->
diff --git a/koha-tmpl/intranet-tmpl/prog/js/z3950_search.js b/koha-tmpl/intranet-tmpl/prog/js/z3950_search.js
index 478c2ee21e..d801f022e7 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/z3950_search.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/z3950_search.js
@@ -16,6 +16,10 @@ function validate_goto_page() {
     }
 }
 
+window.addEventListener('pageshow', function( e ){
+    $('body').css("cursor", "default");
+});
+
 $( document ).ready( function() {
 
     $( "#CheckAll" ).click( function(e) {
@@ -27,7 +31,7 @@ $( document ).ready( function() {
         $( ".checkboxed input:checkbox" ).prop("checked", false);
     });
 
-    $( ".submit" ).on( "click", function() {
+    $( "#submit_z3950_search" ).on( "click", function() {
         $( "body" ).css( "cursor", "wait" );
     });
     $( "[name='changepage_prev']" ).on( "click", function() {