diff --git a/web/styles/message_header.css b/web/styles/message_header.css
index 84d19bfe75..6cbcf51676 100644
--- a/web/styles/message_header.css
+++ b/web/styles/message_header.css
@@ -80,6 +80,11 @@
             visibility: hidden;
         }
 
+        /* When any of the actions are focused, don't hide them */
+        .recipient_bar_controls:focus-within {
+            visibility: visible;
+        }
+
         /* Show the bar controls on hover and when the bar is sticky */
         &:hover {
             .recipient_bar_controls {
diff --git a/web/styles/zulip.css b/web/styles/zulip.css
index 3f6e967771..c431047a17 100644
--- a/web/styles/zulip.css
+++ b/web/styles/zulip.css
@@ -901,6 +901,7 @@ div.focused-message-list.is-conversation-view .recipient_row {
 .topic_edit {
     display: none;
     line-height: 22px;
+    visibility: visible;
 
     .alert {
         display: inline-block;