diff --git a/app/javascript/mastodon/components/status_banner.tsx b/app/javascript/mastodon/components/status_banner.tsx
index 61aede567..34af20919 100644
--- a/app/javascript/mastodon/components/status_banner.tsx
+++ b/app/javascript/mastodon/components/status_banner.tsx
@@ -18,8 +18,13 @@ export const StatusBanner: React.FC<{
 
   const buttonRef = useRef<HTMLButtonElement>(null);
   const forwardClick = useCallback<MouseEventHandler>((e) => {
-    if (buttonRef.current && e.target !== buttonRef.current) {
+    if (
+      buttonRef.current &&
+      e.target !== buttonRef.current &&
+      !buttonRef.current.contains(e.target as Node)
+    ) {
       buttonRef.current.click();
+      buttonRef.current.focus();
     }
   }, []);