diff --git a/src/components/middle/composer/EmojiTooltip.tsx b/src/components/middle/composer/EmojiTooltip.tsx
index 840f03f4c..3aa79683f 100644
--- a/src/components/middle/composer/EmojiTooltip.tsx
+++ b/src/components/middle/composer/EmojiTooltip.tsx
@@ -122,6 +122,7 @@ const EmojiTooltip: FC<OwnProps> = ({
     isActive: isOpen,
     isHorizontal: true,
     items: listEmojis,
+    shouldRemoveSelectionOnReset: true,
     onSelect: handleSelect,
     onClose,
   });
diff --git a/src/components/middle/composer/hooks/useKeyboardNavigation.ts b/src/components/middle/composer/hooks/useKeyboardNavigation.ts
index 4c7ce0aef..8be089c8b 100644
--- a/src/components/middle/composer/hooks/useKeyboardNavigation.ts
+++ b/src/components/middle/composer/hooks/useKeyboardNavigation.ts
@@ -44,6 +44,8 @@ export function useKeyboardNavigation({
   const handleItemSelect = useLastCallback((e: KeyboardEvent) => {
     // Prevent action on key combinations
     if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) return false;
+    if (!isActive) return false;
+
     if (items && items.length && selectedItemIndex > -1) {
       const item = items[selectedItemIndex];
       if (item) {