diff --git a/umap/static/umap/base.css b/umap/static/umap/base.css
index cb926b15..2dd6d941 100644
--- a/umap/static/umap/base.css
+++ b/umap/static/umap/base.css
@@ -203,6 +203,10 @@ dt {
 /*   Various   */
 /* *********** */
 
+.nobr {
+    white-space: nowrap;
+}
+
 .text {
     word-break: break-word;
     white-space: pre-line;
diff --git a/umap/static/umap/js/modules/help.js b/umap/static/umap/js/modules/help.js
index c5c2fbad..4363e6cf 100644
--- a/umap/static/umap/js/modules/help.js
+++ b/umap/static/umap/js/modules/help.js
@@ -196,7 +196,7 @@ export default class Help {
         .split('+')
         .map((el) => `<kbd>${el}</kbd>`)
         .join('+')
-      label += ` ${shortcut}`
+      label += ` <span class="nobr">${shortcut}</span>`
     } else {
       label += ` (${shortcut})`
     }
diff --git a/umap/static/umap/js/modules/utils.js b/umap/static/umap/js/modules/utils.js
index 17994485..625674da 100644
--- a/umap/static/umap/js/modules/utils.js
+++ b/umap/static/umap/js/modules/utils.js
@@ -126,6 +126,7 @@ export function escapeHTML(s) {
       'frameborder',
       'scrolling',
       'controls',
+      'class',
     ],
     ALLOWED_ATTR: ['href', 'src', 'width', 'height', 'style', 'dir', 'title', 'type'],
     // Added: `geo:` URL scheme as defined in RFC5870: