diff --git a/app/containers/MessageBox/index.tsx b/app/containers/MessageBox/index.tsx
index 2c6af0dd8..6a71d05e0 100644
--- a/app/containers/MessageBox/index.tsx
+++ b/app/containers/MessageBox/index.tsx
@@ -958,6 +958,11 @@ class MessageBox extends Component<IMessageBoxProps, IMessageBoxState> {
 		this.setState({ showEmojiKeyboard: false });
 	};
 
+	closeEmojiKeyboardAndFocus = () => {
+		this.closeEmoji();
+		this.focus();
+	};
+
 	closeEmojiSearchbar = () => {
 		this.setState({ showEmojiSearchbar: false });
 	};
@@ -982,7 +987,7 @@ class MessageBox extends Component<IMessageBoxProps, IMessageBoxState> {
 
 		this.clearInput();
 		this.debouncedOnChangeText.stop();
-		this.closeEmoji();
+		this.closeEmojiKeyboardAndFocus();
 		this.stopTrackingMention();
 		this.handleTyping(false);
 		if (message.trim() === '' && !showSend) {
@@ -1261,7 +1266,7 @@ class MessageBox extends Component<IMessageBoxProps, IMessageBoxState> {
 					editing={editing}
 					editCancel={this.editCancel}
 					openEmoji={this.openEmoji}
-					closeEmoji={this.closeEmoji}
+					closeEmoji={this.closeEmojiKeyboardAndFocus}
 				/>
 				<TextInput
 					ref={component => (this.component = component)}