diff --git a/ts/components/CompositionArea.tsx b/ts/components/CompositionArea.tsx
index 522214e0a9..5dfb08c701 100644
--- a/ts/components/CompositionArea.tsx
+++ b/ts/components/CompositionArea.tsx
@@ -359,6 +359,7 @@ export const CompositionArea = ({
       <div className="CompositionArea__button-cell">
         <EmojiButton
           i18n={i18n}
+          closeOnPick
           doSend={handleForceSend}
           onPickEmoji={insertEmoji}
           onClose={focusInput}