diff --git a/src/libs/focusTextInputAfterAnimation/index.android.ts b/src/libs/focusTextInputAfterAnimation/index.android.ts
deleted file mode 100644
index cca8a6588103..000000000000
--- a/src/libs/focusTextInputAfterAnimation/index.android.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import type FocusTextInputAfterAnimation from './types';
-
-/**
- * Initially this file is intended for native ios but use index.native.js filename and affects android.
- *
- * Initial comment for this file is:
- * "Focus the text input with a slight delay to make sure modals are closed first.
- * Since in react-native-modal `onModalHide` is called before the modal is actually hidden.
- * It results in the keyboard being dismissed right away on both iOS and Android.
- * See this discussion for more details: https://github.com/Expensify/App/issues/18300"
- *
- * But the bug already fixed, without using setTimeout for IOS the focus seems to work properly.
- * Instead there is new IOS bug of text input content doesn't scroll to bottom if using setTimeout,
- * also there is an android keyboard doesn't show up bug when text input is focused and
- * the use of setTimeout will make the keyboard show up properly.
- *
- * @param animationLength you must use your best guess as to what a good animationLength is. It can't be too short, or the animation won't be finished. It can't be too long or
- *      the user will notice that it feels sluggish
- */
-const focusTextInputAfterAnimation: FocusTextInputAfterAnimation = (inputRef, animationLength = 0) => {
-    setTimeout(() => {
-        inputRef?.focus();
-    }, animationLength);
-};
-
-export default focusTextInputAfterAnimation;
diff --git a/src/libs/focusTextInputAfterAnimation/index.ts b/src/libs/focusTextInputAfterAnimation/index.ts
deleted file mode 100644
index 66d0c35c1a63..000000000000
--- a/src/libs/focusTextInputAfterAnimation/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type FocusTextInputAfterAnimation from './types';
-
-/**
- * This library is a no-op for all platforms except for Android and iOS and will immediately focus the given input without any delays.
- */
-const focusTextInputAfterAnimation: FocusTextInputAfterAnimation = (inputRef) => {
-    inputRef?.focus();
-};
-
-export default focusTextInputAfterAnimation;
diff --git a/src/libs/focusTextInputAfterAnimation/types.ts b/src/libs/focusTextInputAfterAnimation/types.ts
deleted file mode 100644
index ce5086328b33..000000000000
--- a/src/libs/focusTextInputAfterAnimation/types.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import type {TextInput} from 'react-native';
-
-type FocusTextInputAfterAnimation = (inputRef: TextInput | HTMLElement | undefined, animationLength: number) => void;
-
-export default FocusTextInputAfterAnimation;
diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx
index 98b626164146..47265cdb57f6 100644
--- a/src/pages/home/report/ReportActionItem.tsx
+++ b/src/pages/home/report/ReportActionItem.tsx
@@ -41,7 +41,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import ControlSelection from '@libs/ControlSelection';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
 import * as ErrorUtils from '@libs/ErrorUtils';
-import focusTextInputAfterAnimation from '@libs/focusTextInputAfterAnimation';
+import focusComposerWithDelay from '@libs/focusComposerWithDelay';
 import ModifiedExpenseMessage from '@libs/ModifiedExpenseMessage';
 import Navigation from '@libs/Navigation/Navigation';
 import Permissions from '@libs/Permissions';
@@ -199,7 +199,7 @@ function ReportActionItem({
     const [moderationDecision, setModerationDecision] = useState<OnyxTypes.DecisionName>(CONST.MODERATION.MODERATOR_DECISION_APPROVED);
     const reactionListRef = useContext(ReactionListContext);
     const {updateHiddenAttachments} = useContext(ReportAttachmentsContext);
-    const textInputRef = useRef<TextInput | HTMLTextAreaElement>();
+    const textInputRef = useRef<TextInput | HTMLTextAreaElement>(null);
     const popoverAnchorRef = useRef<Exclude<ReportActionContextMenu.ContextMenuAnchor, TextInput>>(null);
     const downloadedPreviews = useRef<string[]>([]);
     const prevDraftMessage = usePrevious(draftMessage);
@@ -274,7 +274,7 @@ function ReportActionItem({
             return;
         }
 
-        focusTextInputAfterAnimation(textInputRef.current, 100);
+        focusComposerWithDelay(textInputRef.current)(true);
     }, [prevDraftMessage, draftMessage]);
 
     useEffect(() => {