diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc
index 30731d69b6..4bce9c463e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc
@@ -34,16 +34,16 @@
 
         <ul>
             [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
-                <li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>
+                <li><a class="keep_text" href="#circ_search">Check out</a></li>
             [% END %]
             [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
-                <li><a onclick="keep_text(1)" href="#checkin_search">Check in</a></li>
+                <li><a class="keep_text" href="#checkin_search">Check in</a></li>
             [% END %]
             [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
-                <li><a onclick="keep_text(2)" href="#renew_search">Renew</a></li>
+                <li><a class="keep_text" href="#renew_search">Renew</a></li>
             [% END %]
             [% IF ( CAN_user_borrowers ) %]
-                <li><a onclick="keep_text(3)" href="#patron_search">Search patrons</a></li>
+                <li><a class="keep_text" href="#patron_search">Search patrons</a></li>
             [% END %]
         </ul>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
index d410dcc588..45517c8d37 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
@@ -241,10 +241,10 @@
     </form>
     </div>
     <ul>
-        <li><a onclick="keep_text(0)" href="#mainmain_heading">Search main heading ($a only)</a></li>
-        <li><a onclick="keep_text(1)" href="#main_heading">Search main heading</a></li>
-        <li><a onclick="keep_text(2)" href="#matchheading_search">Search all headings</a></li>
-        <li><a onclick="keep_text(3)" href="#entire_record">Search entire record</a></li>
+        <li><a class="keep_text" href="#mainmain_heading">Search main heading ($a only)</a></li>
+        <li><a class="keep_text" href="#main_heading">Search main heading</a></li>
+        <li><a class="keep_text" href="#matchheading_search">Search all headings</a></li>
+        <li><a class="keep_text" href="#entire_record">Search entire record</a></li>
     </ul>
 </div><!-- /header_search -->
 </div><!-- /gradient -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
index 9bf4e70a43..be36c7e597 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
@@ -33,9 +33,9 @@
         </form>
     </div>[% END %]
             <ul>
-            <li><a onclick="keep_text(0)" href="#budgets_search">Search funds</a></li>
-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
+            <li><a class="keep_text" href="#budgets_search">Search funds</a></li>
+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
+            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
             </ul>
 </div>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
index 1e06e69af7..6cc5cd14fd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
@@ -32,10 +32,10 @@
 [% END %]
 
 <ul>
-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#checkin_search">Check in</a></li>[% END %]
-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(2)" href="#renew_search">Renew</a></li>[% END %]
-    [% IF ( CAN_user_catalogue ) %]<li onclick="keep_text(3)" class="ui-tabs-active"><a href="#catalog_search">Search the catalog</a></li>[% END %]
+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %]
+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %]
+    [% IF ( CAN_user_catalogue ) %]<li class="keep_text" class="ui-tabs-active"><a href="#catalog_search">Search the catalog</a></li>[% END %]
 </ul>
 
 </div><!-- /header_search -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
index 872c86e0c3..da1e2df240 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
@@ -39,11 +39,11 @@
         </div>
 
         <ul>
-            <li><a onclick="keep_text(0)" href="#addbooks_search">Cataloging search</a></li>
-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(2)" href="#checkin_search">Check in</a></li>[% END %]
-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(3)" href="#renew_search">Renew</a></li>[% END %]
-            <li><a onclick="keep_text(4)" href="#catalog_search">Search the catalog</a></li>
+            <li><a class="keep_text" href="#addbooks_search">Cataloging search</a></li>
+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %]
+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %]
+            <li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>
         </ul>
     </div><!-- /header_search -->
 </div><!-- /gradient -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
index fdc1d2e4a9..de271c3b28 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
@@ -22,9 +22,9 @@
 [% END %]
 
 <ul>
-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#renew_search">Renew</a></li>[% END %]
-    [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %]
+    [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
 </ul>   
 
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
index 92a0685e7d..4a5dc97989 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
@@ -30,10 +30,10 @@
 [% END %]
 
 <ul>
-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#checkin_search">Check in</a></li>[% END %]
-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(2)" href="#renew_search">Renew</a></li>[% END %]
-    [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(3)" href="#catalog_search">Search the catalog</a></li>[% END %]
+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %]
+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %]
+    [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
 </ul>   
 
 </div><!-- /header_search -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
index 3b11479094..2b85c95397 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
@@ -20,9 +20,9 @@
 		</form>
 	</div>[% END %]
 			<ul>
-            <li><a onclick="keep_text(0)" href="#city_search">Search cities</a></li>
-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
+            <li><a class="keep_text" href="#city_search">Search cities</a></li>
+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
+            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
 			</ul>	
 </div>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
index c173cc4420..eae3335509 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
@@ -22,9 +22,9 @@
 	</div>[% END %]
 
 	<ul>
-            <li><a onclick="keep_text(0)" href="#contract_description_search">Search contracts</a></li>
-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
+            <li><a class="keep_text" href="#contract_description_search">Search contracts</a></li>
+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
+            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
 	</ul>
 </div>
 </div><!-- /gradient -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
index 759a0e2cf0..6983b2266a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
@@ -18,9 +18,9 @@
 		</form>
 	</div>[% END %]
 			<ul>
-            <li><a onclick="keep_text(0)" href="#currency_search">Search currencies</a></li>
-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
+            <li><a class="keep_text" href="#currency_search">Search currencies</a></li>
+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
+            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
 			</ul>	
 </div>
 </div><!-- /gradient -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
index 8c9a3b7450..08902d284a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
@@ -39,11 +39,11 @@
 </div>[% END %]
 
 <ul>
-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#checkin_search">Check in</a></li>[% END %]
-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(2)" href="#renew_search">Renew</a></li>[% END %]
-    [% IF ( CAN_user_borrowers ) %]<li><a onclick="keep_text(3)" href="#patron_search">Search patrons</a></li>[% END %]
-    [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(4)" href="#catalog_search">Search the catalog</a></li>[% END %]
+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %]
+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %]
+    [% IF ( CAN_user_borrowers ) %]<li><a class="keep_text" href="#patron_search">Search patrons</a></li>[% END %]
+    [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
 </ul>
 
 </div><!-- /header_search -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
index dbcb0f4548..815903d536 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
@@ -18,9 +18,9 @@
 		</form>
 	</div>[% END %]
 			<ul>
-            <li><a onclick="keep_text(0)" href="#notices_search">Search notices</a></li>
-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
+            <li><a class="keep_text" href="#notices_search">Search notices</a></li>
+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
+            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
 			</ul>	
 </div>
 </div><!-- /gradient -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
index e12ccd0d43..d1deca7419 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -146,11 +146,11 @@
     </div>[% END %]
 
     <ul>
-        <li><a onclick="keep_text(0)" href="#patron_search">Search patrons</a></li>
-        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
-        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(2)" href="#checkin_search">Check in</a></li>[% END %]
-        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(3)" href="#renew_search">Renew</a></li>[% END %]
-        [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(4)" href="#catalog_search">Search the catalog</a></li>[% END %]
+        <li><a class="keep_text" href="#patron_search">Search patrons</a></li>
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %]
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %]
+        [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
     </ul>
 </div><!-- /header_search -->
 </div><!-- /gradient -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
index 88215b4797..72cb127dec 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
@@ -19,9 +19,9 @@
 	</div>[% END %]
 
 	<ul>
-            <li><a onclick="keep_text(0)" href="#patron_category_search">Search patron categories</a></li>
-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
+            <li><a class="keep_text" href="#patron_category_search">Search patron categories</a></li>
+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
+            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
 			</ul>	
 </div>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
index f8c70aca1e..9b82c4b2f7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
@@ -21,9 +21,9 @@
 	</div>
 	[% END %]
 			<ul>
-            <li><a onclick="keep_text(0)" href="#syspref_search">Search system preferences</a></li>
-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
+            <li><a class="keep_text" href="#syspref_search">Search system preferences</a></li>
+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
+            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
 			</ul>
 </div>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
index 7d75a71b4b..f3c9aaaf93 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
@@ -19,9 +19,9 @@
 	</div>
 	[% END %]
 			<ul>
-            <li><a onclick="keep_text(0)" href="#printer_search">Search printers</a></li>
-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
+            <li><a class="keep_text" href="#printer_search">Search printers</a></li>
+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
+            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
 			</ul>	
 </div>
 </div><!-- /gradient -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
index a22ff0f6ca..e8b2493f18 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
@@ -29,8 +29,8 @@
     [% END %]
     <ul>
       <li><a href="#subscription_search">Search subscriptions</a></li>
-      [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
-      [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(1)" href="#catalog_search">Search the catalog</a></li>[% END %]
+      [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
+      [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
     </ul>
   </div><!-- /header_search -->
 </div><!-- /gradient -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
index 802853a2d0..3928e25055 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
@@ -25,8 +25,8 @@
 	[% END %]
 			<ul>
             <li><a href="#suggestions_search">Search suggestions</a></li>
-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(1)" href="#catalog_search">Search the catalog</a></li>[% END %]
+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
+            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
             </ul>
 </div>
 </div><!-- /gradient -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
index d78b35870a..d81f60fa6c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
@@ -21,9 +21,9 @@
 	</div>
 	[% END %]
 			<ul>
-            <li><a onclick="keep_text(0)" href="#z3950_search">Search Z39.50/SRU servers</a></li>
-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
+            <li><a class="keep_text" href="#z3950_search">Search Z39.50/SRU servers</a></li>
+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
+            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
 			</ul>	
 </div>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
index 599a3bd982..5f9ed72177 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
@@ -52,6 +52,10 @@ $.fn.selectTabByID = function (tabID) {
     $("body").on("keypress", ".noEnterSubmit", function(e){
         return checkEnter(e);
     });
+    $(".keep_text").on("click",function(){
+        var field_index = $(this).parent().index();
+        keep_text( field_index );
+    });
 });
 
 // http://jennifermadden.com/javascript/stringEnterKeyDetector.html
@@ -158,4 +162,4 @@ function keep_text(clicked_index) {
     for (i = 0; i < searchboxes.length; i++) {
         searchboxes[i].value = persist;
     }
-}
\ No newline at end of file
+}