diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt
index 9c49cc867d..90575307a5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt
@@ -279,8 +279,8 @@
     <tbody>
         [% FOREACH shortcut IN shortcuts %]
             <tr>
-                <td>[% shortcut.shortcut_keys %]</td>
-                <td>[% shortcut.shortcut_desc %]</td>
+                <td>[% shortcut.shortcut_keys | html %]</td>
+                <td>[% shortcut.shortcut_desc | html %]</td>
             </tr>
         [% END %]
         <tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/adveditorshortcuts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/adveditorshortcuts.tt
index c1b98dc3e3..abbc4ac37b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/adveditorshortcuts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/adveditorshortcuts.tt
@@ -40,10 +40,10 @@
                         <tbody>
                            [% FOREACH shortcut IN shortcuts %]
                         <tr>
-                            <td><label for="shortcut_keys">[% shortcut.shortcut_desc %]</label></td>
+                            <td><label for="shortcut_keys">[% shortcut.shortcut_desc | html %]</label></td>
                             <td>
-                                <input type="hidden" name="shortcut_name" value="[% shortcut.shortcut_name %]">
-                                <input type="text" name="shortcut_keys" value="[% shortcut.shortcut_keys %]">
+                                <input type="hidden" name="shortcut_name" value="[% shortcut.shortcut_name | html %]">
+                                <input type="text" name="shortcut_keys" value="[% shortcut.shortcut_keys | html %]">
                            </td>
                         </tr>
                    [% END %]
diff --git a/tools/adveditorshortcuts.pl b/tools/adveditorshortcuts.pl
index a5162b14d7..6e4279c6a8 100755
--- a/tools/adveditorshortcuts.pl
+++ b/tools/adveditorshortcuts.pl
@@ -45,7 +45,6 @@ use Koha::KeyboardShortcuts;
 
 my $input            = new CGI;
 my $op               = $input->param('op') || 'list';
-my @messages;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => "tools/adveditorshortcuts.tt",