diff --git a/www/common/sframe-common-mailbox.js b/www/common/sframe-common-mailbox.js
index f80434e9a..0b114023e 100644
--- a/www/common/sframe-common-mailbox.js
+++ b/www/common/sframe-common-mailbox.js
@@ -100,7 +100,7 @@ define([
                 avatar = h('span.cp-avatar-image', h('img', { src:'/customize/CryptPad_logo.svg' }));
             }
             var order = -Math.floor((Util.find(data, ['content', 'msg', 'ctime']) || 0) / 1000);
-            const tabIndexValue = data.content.isClickable ? '0': 'undefined';
+            const tabIndexValue = 0; //data.content.isClickable ? '0': 'undefined';
             notif = h('li.cp-notification', {
                 role: 'menuitem',
                 tabindex: '0',
@@ -128,6 +128,7 @@ define([
                         $(notif).find('.cp-notification-content p').html(data.content.getFormatText());
                     }, 60000);
                 }
+                $(notif).find('.cp-notification-content').attr('aria-label', data.content.getFormatText().replace(/<[^>]*>/g, '')); // removes html tags from the text
             }
 
             $(notif).mouseenter((e) => {
diff --git a/www/notifications/app-notifications.less b/www/notifications/app-notifications.less
index 338773867..57d38936f 100644
--- a/www/notifications/app-notifications.less
+++ b/www/notifications/app-notifications.less
@@ -125,6 +125,10 @@
                     justify-content: flex-start;
                     align-items: center;
                     margin: 0.1rem;
+                    &:focus-visible {
+                        outline: @variables_focus_style;
+                        border-radius: @variables_radius;
+                    }
                     p {
                         display: inline-block;
                         margin: 1rem 1rem;