diff --git a/app/components/post_draft/custom_emoji_picker/emoji_picker/emoji_picker.tsx b/app/components/post_draft/custom_emoji_picker/emoji_picker/emoji_picker.tsx
index 05100044b3..b47cef3ed7 100644
--- a/app/components/post_draft/custom_emoji_picker/emoji_picker/emoji_picker.tsx
+++ b/app/components/post_draft/custom_emoji_picker/emoji_picker/emoji_picker.tsx
@@ -24,7 +24,7 @@ type Props = {
     file?: ExtractedFileInfo;
     recentEmojis: string[];
     testID?: string;
-    focus?: () => void;
+    handleToggleEmojiPicker: () => void;
     deleteCharFromCurrentCursorPosition: () => void;
     isEmojiSearchFocused: boolean;
     setIsEmojiSearchFocused: React.Dispatch<React.SetStateAction<boolean>>;
@@ -44,7 +44,7 @@ const EmojiPicker: React.FC<Props> = ({
     customEmojis,
     onEmojiPress,
     testID = '',
-    focus,
+    handleToggleEmojiPicker,
     deleteCharFromCurrentCursorPosition,
     isEmojiSearchFocused,
     setIsEmojiSearchFocused,
@@ -85,7 +85,7 @@ const EmojiPicker: React.FC<Props> = ({
             file={file}
             onEmojiPress={onEmojiPress}
             recentEmojis={recentEmojis}
-            focus={focus}
+            handleToggleEmojiPicker={handleToggleEmojiPicker}
             deleteCharFromCurrentCursorPosition={deleteCharFromCurrentCursorPosition}
         />
     );
diff --git a/app/components/post_draft/custom_emoji_picker/emoji_sections/index.tsx b/app/components/post_draft/custom_emoji_picker/emoji_sections/index.tsx
index 2b032c2d56..cb87ef57eb 100644
--- a/app/components/post_draft/custom_emoji_picker/emoji_sections/index.tsx
+++ b/app/components/post_draft/custom_emoji_picker/emoji_sections/index.tsx
@@ -89,7 +89,7 @@ type Props = {
     file?: ExtractedFileInfo;
     onEmojiPress: (emoji: string) => void;
     recentEmojis: string[];
-    focus?: () => void;
+    handleToggleEmojiPicker: () => void;
     deleteCharFromCurrentCursorPosition: () => void;
 }
 
@@ -155,7 +155,7 @@ const EmojiSections: React.FC<Props> = ({
     imageUrl,
     onEmojiPress,
     recentEmojis,
-    focus,
+    handleToggleEmojiPicker,
     deleteCharFromCurrentCursorPosition,
 }) => {
     const serverUrl = useServerUrl();
@@ -367,7 +367,7 @@ const EmojiSections: React.FC<Props> = ({
                 testID='emoji_picker.emoji_sections.section_list'
             />
             <EmojiCategoryBar
-                focus={focus}
+                handleToggleEmojiPicker={handleToggleEmojiPicker}
                 deleteCharFromCurrentCursorPosition={deleteCharFromCurrentCursorPosition}
                 isEmojiPicker={true}
             />
diff --git a/app/components/post_draft/custom_emoji_picker/index.tsx b/app/components/post_draft/custom_emoji_picker/index.tsx
index 99cd5cd06d..5645402d23 100644
--- a/app/components/post_draft/custom_emoji_picker/index.tsx
+++ b/app/components/post_draft/custom_emoji_picker/index.tsx
@@ -21,7 +21,7 @@ type Props = {
     inputRef: React.MutableRefObject<PasteInputRef | undefined>;
     isEmojiPickerFocused: boolean;
     onEmojiPress: (emoji: string) => void;
-    focus?: () => void;
+    handleToggleEmojiPicker: () => void;
     deleteCharFromCurrentCursorPosition: () => void;
     setIsEmojiPickerOpen: React.Dispatch<React.SetStateAction<boolean>>;
     setIsEmojiPickerFocused: React.Dispatch<React.SetStateAction<boolean>>;
@@ -46,7 +46,7 @@ const CustomEmojiPicker: React.FC<Props> = ({
     inputRef,
     isEmojiPickerFocused,
     onEmojiPress,
-    focus,
+    handleToggleEmojiPicker,
     deleteCharFromCurrentCursorPosition,
     setIsEmojiPickerOpen,
     setIsEmojiPickerFocused,
@@ -111,7 +111,7 @@ const CustomEmojiPicker: React.FC<Props> = ({
             <EmojiPicker
                 onEmojiPress={handleEmojiPress}
                 testID='custom_emoji_picker'
-                focus={focus}
+                handleToggleEmojiPicker={handleToggleEmojiPicker}
                 deleteCharFromCurrentCursorPosition={deleteCharFromCurrentCursorPosition}
                 setIsEmojiSearchFocused={setIsEmojiSearchFocused}
                 isEmojiSearchFocused={isEmojiSearchFocused}
diff --git a/app/components/post_draft/draft_input/index.tsx b/app/components/post_draft/draft_input/index.tsx
index 5c33e7317f..5da115ef68 100644
--- a/app/components/post_draft/draft_input/index.tsx
+++ b/app/components/post_draft/draft_input/index.tsx
@@ -352,7 +352,7 @@ export default function DraftInput({
                         keyboardTracker={keyboardTracker}
                         inputRef={inputRef}
                         onEmojiPress={handleEmojiPress}
-                        focus={handleToggleEmojiPicker}
+                        handleToggleEmojiPicker={handleToggleEmojiPicker}
                         deleteCharFromCurrentCursorPosition={deleteCharFromCurrentCursorPosition}
                         setIsEmojiPickerOpen={setIsEmojiPickerOpen}
                         isEmojiPickerFocused={isEmojiPickerFocused}
diff --git a/app/screens/emoji_picker/picker/emoji_category_bar/index.tsx b/app/screens/emoji_picker/picker/emoji_category_bar/index.tsx
index 96fd749e6f..9fbef5bb12 100644
--- a/app/screens/emoji_picker/picker/emoji_category_bar/index.tsx
+++ b/app/screens/emoji_picker/picker/emoji_category_bar/index.tsx
@@ -65,14 +65,14 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({
 
 type Props = {
     onSelect?: (index: number | undefined) => void;
-    focus?: () => void;
+    handleToggleEmojiPicker?: () => void;
     deleteCharFromCurrentCursorPosition?: () => void;
     isEmojiPicker?: boolean;
 }
 
 const EmojiCategoryBar = ({
     onSelect,
-    focus,
+    handleToggleEmojiPicker,
     deleteCharFromCurrentCursorPosition,
     isEmojiPicker = false,
 }: Props) => {
@@ -112,11 +112,11 @@ const EmojiCategoryBar = ({
                     style={styles.container}
                     testID='emoji_picker.category_bar'
                 >
-                    {focus && deleteCharFromCurrentCursorPosition &&
+                    {handleToggleEmojiPicker && deleteCharFromCurrentCursorPosition &&
                     <View style={styles.categoryBar}>
                         <View style={styles.keyboardControls}>
                             <Pressable
-                                onPress={() => focus()}
+                                onPress={() => handleToggleEmojiPicker()}
                                 style={styles.actionIcons}
                             >
                                 <CompassIcon