diff --git a/Koha/Template/Plugin/Branches.pm b/Koha/Template/Plugin/Branches.pm
index 343158cc16..d1801bee9d 100644
--- a/Koha/Template/Plugin/Branches.pm
+++ b/Koha/Template/Plugin/Branches.pm
@@ -24,6 +24,7 @@ use base qw( Template::Plugin );
 use Encode qw{encode decode};
 
 use C4::Koha;
+use C4::Context;
 
 sub GetName {
     my ( $self, $branchcode ) = @_;
@@ -35,4 +36,10 @@ sub GetName {
     return $b ? encode( 'UTF-8', $b->{'branchname'} ) : q{};
 }
 
+sub GetLoggedInBranchcode {
+    my ($self) = @_;
+
+    return C4::Context->userenv->{'branch'} if C4::Context->userenv;
+}
+
 1;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc
index 388c467f94..8e3bf66a3b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc
@@ -1,3 +1,4 @@
+[% USE Branches %]
 [% IF ( CAN_user_circulate ) %][% IF ( CircAutocompl ) %]<script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -25,8 +26,9 @@ $(document).ready(function(){
     <form action="/cgi-bin/koha/circ/circulation.pl" id="patronsearch" method="post">
     [% IF ( CircAutocompl ) %]
     <div class="autocomplete">
-                <input autocomplete="off" id="findborrower" name="findborrower" size="40" class="focus" type="text" /> <input id="autocsubmit" type="submit" class="submit" value="Submit" />
-                <input name="branch" value="[% branch %]" type="hidden" />
+                <input autocomplete="off" id="findborrower" name="findborrower" size="40" class="focus" type="text" />
+                <input id="autocsubmit" type="submit" class="submit" value="Submit" />
+                <input name="branch" value="[% Branches.GetLoggedInBranchcode() %]" type="hidden" />
                 <input name="printer" value="" type="hidden" />
             [% IF ( stickyduedate ) %]
                 <input type="hidden" name="duedatespec" value="[% duedatespec %]" />