diff --git a/catalogue/search.pl b/catalogue/search.pl
index 06e11693c3..7ba9cf45c5 100755
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -501,7 +501,7 @@ for my $this_cgi ( split('&',$query_cgi) ) {
         $scan_index_to_use = $input_value; # unless $scan_index_to_use;
     }
     if ($input_name eq 'q') {
-        $scan_search_term_to_use = $input_value;
+        $scan_search_term_to_use = Encode::decode_utf8( uri_unescape( $input_value ));
     }
 }
 $template->param ( QUERY_INPUTS => \@query_inputs,
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
index 68038cbfbc..af92b49bcd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -398,7 +398,7 @@ var holdForPatron = function () {
                 <tr>
                     <td>
                         [% IF ( scan_search_term_to_use ) %]
-                            Scan Index for: <input type="text" name="q" id="scan-index" size="35" value="[% scan_search_term_to_use %]" />
+                            Scan Index for: <input type="text" name="q" id="scan-index" size="35" value="[% scan_search_term_to_use | html %]" />
                         [% ELSE %]
                             Scan Index for: <input type="text" name="q" id="scan-index" size="35" value="" />
                         [% END %]