diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
index ad0b82e4b4..3c8fe19377 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -1631,6 +1631,14 @@ dd {
     display: inline-block;
 }
 
+.patron_autocomplete {
+    border: 1px solid #C7C7CE;
+    border-radius: .3rem;
+    line-height: 1.5;
+    padding: .375rem .75rem;
+    transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out;
+}
+
 .patronviews {
     border-right: 1px solid #000;
     border-top: 1px solid #000;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index 1f4ba4f994..8b597b848a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -30,15 +30,6 @@
             display: flex;
             gap: 0.5rem;
         }
-        #patron_checkout_search input[type="text"] {
-            border: 1px solid #c7c7ce;
-            border-radius: 0.3rem;
-            line-height: 1.5;
-            padding: 0.375rem 0.75rem;
-            transition:
-                border-color 0.15s ease-in-out,
-                box-shadow 0.15s ease-in-out;
-        }
     </style>
 [% END %]
 </head>
@@ -1067,7 +1058,7 @@
     [% ELSE %]
         <form action="/cgi-bin/koha/circ/circulation.pl" id="patronsearch" method="get">
             <fieldset id="patron_checkout_search">
-                <input autocomplete="off" id="findborrower_main" name="findborrower" type="text" placeholder="Enter patron card number or partial name" size="40" />
+                <input autocomplete="off" id="findborrower_main" class="patron_autocomplete" name="findborrower" type="text" placeholder="Enter patron card number or partial name" size="40" />
                 [% IF ( stickyduedate ) %]
                     <input type="hidden" name="duedatespec" value="[% duedatespec | html %]" />
                     <input type="hidden" name="stickyduedate" value="[% stickyduedate | html %]" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
index 11e018b0ee..d4fc3796ef 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
@@ -28,11 +28,13 @@
     [% END %]</title
 >
 [% INCLUDE 'doc-head-close.inc' %]
-<style nonce="[% Koha.CSPNonce | $raw %]">
-    textarea {
-        width: 100%;
-    }
-</style>
+[% FILTER collapse %]
+    <style nonce="[% Koha.CSPNonce | $raw %]">
+        textarea {
+            width: 100%;
+        }
+    </style>
+[% END %]
 
 [% BLOCK list_permissions %]
     <div class="fg-row">
@@ -214,27 +216,26 @@
 
         <form action="/cgi-bin/koha/virtualshelves/shelves.pl" id="transferform" method="post">
             [% INCLUDE 'csrf-token.inc' %]
-            <fieldset>
+            <fieldset class="rows">
+                <legend class="visually-hidden">Transfer ownership</legend>
                 <input type="hidden" name="op" value="cud-transfer" />
                 <input type="hidden" name="public" value="1" />
                 <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" />
-
-                <div>
-                    <label for="find_patron">Search for new owner: </label>
-                    <input autocomplete="off" id="find_patron" type="text" style="width:150px" class="noEnterSubmit" />
-                </div>
-
-                <br />
-                <div>
-                    <label for="find_patron">New owner: </label>
-                    <span id="new_owner_name"></span>
-                </div>
-
-                <br />
-                <fieldset class="action">
-                    <input type="submit" class="btn btn-primary" value="Transfer" />
-                    <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&amp;public=1" class="cancel">Cancel</a>
-                </fieldset>
+                <ol>
+                    <li>
+                        <label for="find_patron">Search for new owner: </label>
+                        <input autocomplete="off" id="find_patron" type="text" size="40" class="patron_autocomplete noEnterSubmit" placeholder="Enter patron card number or partial name" />
+                    </li>
+                    <li style="display:none">
+                        <label for="find_patron">New owner: </label>
+                        <span id="new_owner_name"></span>
+                        <input type="hidden" id="new_owner" name="new_owner" value="" />
+                    </li>
+                </ol>
+            </fieldset>
+            <fieldset class="action">
+                <input type="submit" class="btn btn-primary" value="Transfer" />
+                <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&amp;public=1" class="cancel">Cancel</a>
             </fieldset>
         </form>
     [% END # /IF op == transfer %]