diff --git a/src/shared/ui-kit/TextEditor/BaseTextEditor.tsx b/src/shared/ui-kit/TextEditor/BaseTextEditor.tsx
index 6afc76d893..734db6ff39 100644
--- a/src/shared/ui-kit/TextEditor/BaseTextEditor.tsx
+++ b/src/shared/ui-kit/TextEditor/BaseTextEditor.tsx
@@ -255,6 +255,7 @@ const BaseTextEditor: FC<TextEditorProps> = (props) => {
           containerClassName={emojiContainerClassName}
           pickerContainerClassName={emojiPickerContainerClassName}
           onEmojiSelect={(emoji) => {
+            Transforms.select(editor, EditorSlate.end(editor, []));
             insertEmoji(editor, emoji.native);
           }}
         />