diff --git a/extensions/approval/js/src/forum/index.js b/extensions/approval/js/src/forum/index.js
index 5f76395eb..cd6e40c6b 100644
--- a/extensions/approval/js/src/forum/index.js
+++ b/extensions/approval/js/src/forum/index.js
@@ -18,7 +18,12 @@ app.initializers.add(
       if (!this.isApproved() && !items.has('hidden')) {
         items.add(
           'awaitingApproval',
-          <Badge type="awaitingApproval" icon="fas fa-gavel" label={app.translator.trans('flarum-approval.forum.badge.awaiting_approval_tooltip')} />
+          <Badge
+            type="awaitingApproval"
+            icon="fas fa-gavel"
+            label={app.translator.trans('flarum-approval.forum.badge.awaiting_approval_tooltip')}
+            tabindex="0"
+          />
         );
       }
     });
diff --git a/extensions/lock/js/src/forum/addLockBadge.js b/extensions/lock/js/src/forum/addLockBadge.js
index 6437caa52..364b78b36 100644
--- a/extensions/lock/js/src/forum/addLockBadge.js
+++ b/extensions/lock/js/src/forum/addLockBadge.js
@@ -6,7 +6,10 @@ import Badge from 'flarum/common/components/Badge';
 export default function addLockBadge() {
   extend(Discussion.prototype, 'badges', function (badges) {
     if (this.isLocked()) {
-      badges.add('locked', <Badge type="locked" label={app.translator.trans('flarum-lock.forum.badge.locked_tooltip')} icon="fas fa-lock" />);
+      badges.add(
+        'locked',
+        <Badge type="locked" label={app.translator.trans('flarum-lock.forum.badge.locked_tooltip')} icon="fas fa-lock" tabindex="0" />
+      );
     }
   });
 }
diff --git a/extensions/sticky/js/src/forum/addStickyBadge.js b/extensions/sticky/js/src/forum/addStickyBadge.js
index e99f80380..c92a35f70 100644
--- a/extensions/sticky/js/src/forum/addStickyBadge.js
+++ b/extensions/sticky/js/src/forum/addStickyBadge.js
@@ -8,7 +8,7 @@ export default function addStickyBadge() {
     if (this.isSticky()) {
       badges.add(
         'sticky',
-        <Badge type="sticky" label={app.translator.trans('flarum-sticky.forum.badge.sticky_tooltip')} icon="fas fa-thumbtack" />,
+        <Badge type="sticky" label={app.translator.trans('flarum-sticky.forum.badge.sticky_tooltip')} icon="fas fa-thumbtack" tabindex="0" />,
         10
       );
     }
diff --git a/extensions/subscriptions/js/src/forum/addSubscriptionBadge.js b/extensions/subscriptions/js/src/forum/addSubscriptionBadge.js
index f40028c24..432da6903 100644
--- a/extensions/subscriptions/js/src/forum/addSubscriptionBadge.js
+++ b/extensions/subscriptions/js/src/forum/addSubscriptionBadge.js
@@ -9,11 +9,25 @@ export default function addSubscriptionBadge() {
 
     switch (this.subscription()) {
       case 'follow':
-        badge = <Badge label={app.translator.trans('flarum-subscriptions.forum.badge.following_tooltip')} icon="fas fa-star" type="following" />;
+        badge = (
+          <Badge
+            label={app.translator.trans('flarum-subscriptions.forum.badge.following_tooltip')}
+            icon="fas fa-star"
+            type="following"
+            tabindex="0"
+          />
+        );
         break;
 
       case 'ignore':
-        badge = <Badge label={app.translator.trans('flarum-subscriptions.forum.badge.ignoring_tooltip')} icon="far fa-eye-slash" type="ignoring" />;
+        badge = (
+          <Badge
+            label={app.translator.trans('flarum-subscriptions.forum.badge.ignoring_tooltip')}
+            icon="far fa-eye-slash"
+            type="ignoring"
+            tabindex="0"
+          />
+        );
         break;
     }
 
diff --git a/extensions/suspend/js/src/forum/index.js b/extensions/suspend/js/src/forum/index.js
index 5a4a01ecf..80eedc15e 100644
--- a/extensions/suspend/js/src/forum/index.js
+++ b/extensions/suspend/js/src/forum/index.js
@@ -28,7 +28,7 @@ app.initializers.add('flarum-suspend', () => {
     if (new Date() < until) {
       items.add(
         'suspended',
-        <Badge icon="fas fa-ban" type="suspended" label={app.translator.trans('flarum-suspend.forum.user_badge.suspended_tooltip')} />,
+        <Badge icon="fas fa-ban" type="suspended" label={app.translator.trans('flarum-suspend.forum.user_badge.suspended_tooltip')} tabindex="0" />,
         100
       );
     }
diff --git a/framework/core/js/src/common/components/Badge.tsx b/framework/core/js/src/common/components/Badge.tsx
index e145979ed..8367c13bd 100644
--- a/framework/core/js/src/common/components/Badge.tsx
+++ b/framework/core/js/src/common/components/Badge.tsx
@@ -26,6 +26,7 @@ export interface IBadgeAttrs extends ComponentAttrs {
  */
 export default class Badge<CustomAttrs extends IBadgeAttrs = IBadgeAttrs> extends Component<CustomAttrs> {
   view() {
+    console.log(this.attrs);
     const { type, icon: iconName, label, color, style = {}, ...attrs } = this.attrs;
 
     const className = classList('Badge', [type && `Badge--${type}`], attrs.className, textContrastClass(color));
diff --git a/framework/core/js/src/common/models/Discussion.tsx b/framework/core/js/src/common/models/Discussion.tsx
index 15d8febbd..782a97973 100644
--- a/framework/core/js/src/common/models/Discussion.tsx
+++ b/framework/core/js/src/common/models/Discussion.tsx
@@ -131,7 +131,7 @@ export default class Discussion extends Model {
     const items = new ItemList<Mithril.Children>();
 
     if (this.isHidden()) {
-      items.add('hidden', <Badge type="hidden" icon="fas fa-trash" label={app.translator.trans('core.lib.badge.hidden_tooltip')} />);
+      items.add('hidden', <Badge type="hidden" icon="fas fa-trash" label={app.translator.trans('core.lib.badge.hidden_tooltip')} tabindex="0" />);
     }
 
     return items;