diff --git a/C4/Auth.pm b/C4/Auth.pm
index 475a825f93..4cd0fe80ea 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -549,9 +549,9 @@ sub get_template_and_user {
         my $opac_limit_override = $ENV{'OPAC_LIMIT_OVERRIDE'};
         my $opac_name           = '';
         if (
-            ( $opac_limit_override && $opac_search_limit && $opac_search_limit =~ /branch:([\w-]+)/ ) ||
-            ( $in->{'query'}->param('limit') && $in->{'query'}->param('limit') =~ /branch:([\w-]+)/ ) ||
-            ( $in->{'query'}->param('limit') && $in->{'query'}->param('limit') =~ /multibranchlimit:(\w+)/ )
+            ( $opac_limit_override && $opac_search_limit && $opac_search_limit =~ /^branch:([\w-]+)/ ) ||
+            ( $in->{'query'}->param('limit') && $in->{'query'}->param('limit') =~ /^branch:([\w-]+)/ ) ||
+            ( $in->{'query'}->param('limit') && $in->{'query'}->param('limit') =~ /^multibranchlimit:(\w+)/ )
           ) {
             $opac_name = $1;    # opac_search_limit is a branch, so we use it.
         } elsif ( $in->{'query'}->param('multibranchlimit') ) {
diff --git a/catalogue/search.pl b/catalogue/search.pl
index f1a270ba70..ebb78bcfb6 100755
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -243,7 +243,7 @@ my @search_groups =
 
 my $branch_limit = '';
 my $limit_param = $cgi->param('limit');
-if ( $limit_param and $limit_param =~ /branch:([\w-]+)/ ) {
+if ( $limit_param and $limit_param =~ /^branch:([\w-]+)/ ) {
     $branch_limit = $1;
 }