From 0a10a302f2bb434155ba1c8ed5fee0b5b744d477 Mon Sep 17 00:00:00 2001
From: automated-signal <37887102+automated-signal@users.noreply.github.com>
Date: Fri, 9 Jan 2026 13:00:50 -0600
Subject: [PATCH] Fix focus state when forwarding

Co-authored-by: trevor-signal <131492920+trevor-signal@users.noreply.github.com>
---
 ts/components/ForwardMessagesModal.dom.tsx            | 8 +-------
 ts/components/conversation/MessageContextMenu.dom.tsx | 9 ++++++++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ts/components/ForwardMessagesModal.dom.tsx b/ts/components/ForwardMessagesModal.dom.tsx
index 257ded19bb..a26adb17f2 100644
--- a/ts/components/ForwardMessagesModal.dom.tsx
+++ b/ts/components/ForwardMessagesModal.dom.tsx
@@ -264,13 +264,7 @@ export function ForwardMessagesModal({
   };
 
   useEffect(() => {
-    const timeout = setTimeout(() => {
-      inputRef.current?.focus();
-    }, 100);
-
-    return () => {
-      clearTimeout(timeout);
-    };
+    inputRef.current?.focus();
   }, []);
 
   const footer = (
diff --git a/ts/components/conversation/MessageContextMenu.dom.tsx b/ts/components/conversation/MessageContextMenu.dom.tsx
index 26c9142257..245cfec936 100644
--- a/ts/components/conversation/MessageContextMenu.dom.tsx
+++ b/ts/components/conversation/MessageContextMenu.dom.tsx
@@ -96,7 +96,14 @@ export function MessageContextMenu({
           </AxoMenuBuilder.Item>
         )}
         {onForward && (
-          <AxoMenuBuilder.Item symbol="forward" onSelect={onForward}>
+          <AxoMenuBuilder.Item
+            symbol="forward"
+            onSelect={() => {
+              // forward modal takes focus
+              shouldReturnFocusToTrigger.current = false;
+              onForward();
+            }}
+          >
             {i18n('icu:MessageContextMenu__forward')}
           </AxoMenuBuilder.Item>
         )}