diff --git a/src/components/message/message-thread-panel.tsx b/src/components/message/message-thread-panel.tsx
index f0e2a03..75466a1 100644
--- a/src/components/message/message-thread-panel.tsx
+++ b/src/components/message/message-thread-panel.tsx
@@ -218,7 +218,6 @@ function MessageThreadPanelContent({
 
     if (!element) {
       setDraft((current) => `${current}${emoji}`)
-      setShowEmojiPanel(false)
       return
     }
 
@@ -227,7 +226,6 @@ function MessageThreadPanelContent({
     const nextDraft = `${draft.slice(0, selectionStart)}${emoji}${draft.slice(selectionEnd)}`
 
     setDraft(nextDraft)
-    setShowEmojiPanel(false)
 
     requestAnimationFrame(() => {
       element.focus()
diff --git a/src/components/refined-rich-post-editor.tsx b/src/components/refined-rich-post-editor.tsx
index f8801f5..cd043f6 100644
--- a/src/components/refined-rich-post-editor.tsx
+++ b/src/components/refined-rich-post-editor.tsx
@@ -666,10 +666,7 @@ export function RefinedRichPostEditor({
         panelRef={panels.emojiPanel.panelRef}
         markdownEmojiMap={markdownEmojiMap}
         onClose={panels.emojiPanel.close}
-        onSelect={(shortcode) => {
-          commands.handleEmojiSelect(shortcode)
-          panels.emojiPanel.close()
-        }}
+        onSelect={commands.handleEmojiSelect}
       />
       <ImageInsertPanel
         open={panels.imagePanel.open}