diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-search-box.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-search-box.inc
index dbd3889a64..54ed623f1a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-search-box.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-search-box.inc
@@ -6,25 +6,7 @@
 [% IF CAN_user_borrowers_edit_borrowers || CAN_user_borrowers_list_borrowers %]
     [%- SET searchtype = searchtype || Koha.Preference('DefaultPatronSearchMethod') -%]
     [% WRAPPER tab_panel tabname="patron_search" bt_active= bs_tab_active %]
-        <form method="get" action="/cgi-bin/koha/members/member.pl" onsubmit="return validatePatronSearch(this);">
-            <script>
-                function validatePatronSearch(form) {
-                    const searchTerm = form.searchmember.value.trim();
-                    const branchSelected = form.branchcode_filter && form.branchcode_filter.value !== "";
-                    const categorySelected = form.categorycode_filter && form.categorycode_filter.value !== "";
-
-                    if (!searchTerm && !branchSelected && !categorySelected) {
-                        $(form.searchmember)
-                            .tooltip({ trigger: "manual", placement: "bottom", title: _("Please enter a card number or name") })
-                            .tooltip("show");
-                        $(document).on("click", function () {
-                            $(form.searchmember).tooltip("hide");
-                        });
-                        return false;
-                    }
-                    return true;
-                }
-            </script>
+        <form id="patron_header_search" method="get" action="/cgi-bin/koha/members/member.pl">
             <input type="hidden" name="quicksearch" value="1" />
 
             <div class="form-title">
diff --git a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
index 29a1f3b064..d067a61f79 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
@@ -1,5 +1,5 @@
 /* global shortcut delBasket AUDIO_ALERT_PATH Cookies */
-/* exported addBibToContext delBibToContext escape_str escape_price openWindow _ removeFocus toUC confirmDelete confirmClone playSound */
+/* exported addBibToContext delBibToContext escape_str escape_price openWindow _ removeFocus toUC confirmDelete confirmClone playSound validatePatronSearch */
 if (KOHA === undefined) var KOHA = {};
 
 function _(s) {
@@ -464,6 +464,11 @@ $(document).ready(function () {
         e.preventDefault();
         togglePanel($(this));
     });
+
+    $("#patron_header_search").on("submit", function (e) {
+        e.preventDefault();
+        validatePatronSearch($(this)[0]);
+    });
 });
 
 function removeLastBorrower() {
@@ -1023,3 +1028,26 @@ function getScrollto(target, elemid) {
     }
     return yoffset.top - elem_height - 20;
 }
+
+function validatePatronSearch(form) {
+    const searchTerm = form.searchmember.value.trim();
+    const branchSelected =
+        form.branchcode_filter && form.branchcode_filter.value !== "";
+    const categorySelected =
+        form.categorycode_filter && form.categorycode_filter.value !== "";
+
+    if (!searchTerm && !branchSelected && !categorySelected) {
+        $(form.searchmember)
+            .tooltip({
+                trigger: "manual",
+                placement: "bottom",
+                title: __("Please enter a card number or name"),
+            })
+            .tooltip("show");
+        $(document).on("click", function () {
+            $(form.searchmember).tooltip("hide");
+        });
+        return false;
+    }
+    return true;
+}