diff --git a/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx b/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx index 2f9daa117273..734a94d50d38 100644 --- a/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx +++ b/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx @@ -653,6 +653,9 @@ function ComposerWithSuggestions( const unsubscribeNavigationBlur = navigation.addListener('blur', () => KeyDownListener.removeKeyDownPressListener(focusComposerOnKeyPress)); const unsubscribeNavigationFocus = navigation.addListener('focus', () => { KeyDownListener.addKeyDownPressListener(focusComposerOnKeyPress); + // The report isn't unmounted and can be focused again after going back from another report so we should update the composerRef again + // @ts-expect-error need to reassign this ref + ReportActionComposeFocusManager.composerRef.current = textInputRef.current; setUpComposeFocusManager(); }); KeyDownListener.addKeyDownPressListener(focusComposerOnKeyPress);