diff --git a/src/components/PostEditor/PostTextarea/Emoji/EmojiList.tsx b/src/components/PostEditor/PostTextarea/Emoji/EmojiList.tsx
index 8f05f035..8670bafd 100644
--- a/src/components/PostEditor/PostTextarea/Emoji/EmojiList.tsx
+++ b/src/components/PostEditor/PostTextarea/Emoji/EmojiList.tsx
@@ -38,7 +38,7 @@ export const EmojiList = forwardRef<EmojiListHandler, EmojiListProps>((props, re
     selectItem(selectedIndex)
   }
 
-  useEffect(() => setSelectedIndex(0), [props.items])
+  useEffect(() => setSelectedIndex(props.items.length ? 0 : -1), [props.items])
 
   useImperativeHandle(ref, () => {
     return {
@@ -53,7 +53,7 @@ export const EmojiList = forwardRef<EmojiListHandler, EmojiListProps>((props, re
           return true
         }
 
-        if (x.event.key === 'Enter') {
+        if (x.event.key === 'Enter' && selectedIndex >= 0) {
           enterHandler()
           return true
         }
diff --git a/src/components/PostEditor/PostTextarea/Mention/MentionList.tsx b/src/components/PostEditor/PostTextarea/Mention/MentionList.tsx
index f5040983..536429fa 100644
--- a/src/components/PostEditor/PostTextarea/Mention/MentionList.tsx
+++ b/src/components/PostEditor/PostTextarea/Mention/MentionList.tsx
@@ -40,7 +40,7 @@ const MentionList = forwardRef<MentionListHandle, MentionListProps>((props, ref)
   }
 
   useEffect(() => {
-    setSelectedIndex(0)
+    setSelectedIndex(props.items.length ? 0 : -1)
   }, [props.items])
 
   useImperativeHandle(ref, () => ({
@@ -55,7 +55,7 @@ const MentionList = forwardRef<MentionListHandle, MentionListProps>((props, ref)
         return true
       }
 
-      if (event.key === 'Enter') {
+      if (event.key === 'Enter' && selectedIndex >= 0) {
         enterHandler()
         return true
       }