diff --git a/customize.dist/messages.js b/customize.dist/messages.js
index a28190005..7ff0456d8 100755
--- a/customize.dist/messages.js
+++ b/customize.dist/messages.js
@@ -135,7 +135,7 @@ define(req, function(AppConfig, Default, Language) {
     };
 
     
-
+    Messages.help_close_button = 'Close help notification'; // XXX
     return Messages;
 
 });
diff --git a/customize.dist/src/less2/include/help.less b/customize.dist/src/less2/include/help.less
index 49e467e67..7f07ab360 100644
--- a/customize.dist/src/less2/include/help.less
+++ b/customize.dist/src/less2/include/help.less
@@ -22,11 +22,17 @@
         }
 
         .cp-help-close {
+            background: none;
+            border: none;
             position: absolute;
             color: @cryptpad_text_col;
             top: 5px;
             right: 5px;
             cursor: pointer;
+            &:focus-visible {
+                outline: @variables_focus_style;
+                border-radius: @variables_radius;
+            }
         }
         .cp-help-text {
             color: @cp_help-fg;
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 62db751d6..a4fedb713 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1279,7 +1279,9 @@ define([
 
         common.fixLinks(text);
 
-        var closeButton = h('span.cp-help-close.fa.fa-times');
+        var closeButton = h('button.cp-help-close.fa.fa-times', {
+            title: 'Close help notification'
+        });
         var $toolbarButton = common.createButton('', true, {
             text: Messages.help_button,
             name: 'help'