diff --git a/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs b/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs
index 6075400d907..0019b1d1797 100644
--- a/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs
+++ b/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs
@@ -5,7 +5,8 @@
     composerModel=model
     options=model.replyOptions
     canWhisper=canWhisper
-    action=model.action}}
+    action=model.action
+    tabindex=tabindex}}
 {{/if}}
 
 <span class="action-title">
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index 99745222cc9..403a382f662 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -16,7 +16,7 @@
             {{plugin-outlet name="composer-open" args=(hash model=model)}}
             <div class='reply-to'>
               <div class="reply-details">
-                {{composer-action-title model=model canWhisper=canWhisper}}
+                {{composer-action-title model=model canWhisper=canWhisper tabindex=8}}
 
                 {{#unless site.mobileView}}
                   {{#if whisperOrUnlistTopicText}}
diff --git a/app/assets/stylesheets/common/select-kit/composer-actions.scss b/app/assets/stylesheets/common/select-kit/composer-actions.scss
index 7dfefaa08a0..87b81f371f1 100644
--- a/app/assets/stylesheets/common/select-kit/composer-actions.scss
+++ b/app/assets/stylesheets/common/select-kit/composer-actions.scss
@@ -14,7 +14,7 @@
           margin: 0!important;
         }
 
-        &:hover {
+        &:hover, &:focus {
           background: $primary-low;
         }
       }