diff --git a/src/components/EmojiPicker/EmojiPicker.vue b/src/components/EmojiPicker/EmojiPicker.vue
index 3083adb2c3..c9e3882a9f 100644
--- a/src/components/EmojiPicker/EmojiPicker.vue
+++ b/src/components/EmojiPicker/EmojiPicker.vue
@@ -94,10 +94,12 @@
 		popover-inner-class="popover-emoji-picker-inner"
 		v-bind="$attrs"
 		v-on="$listeners">
+		@after-show="afterShow">
 		<template #trigger>
 			<slot />
 		</template>
 		<Picker
+			ref="picker"
 			:auto-focus="true"
 			color="var(--color-primary)"
 			:data="emojiIndex"
@@ -216,6 +218,15 @@ export default {
 				this.open = false
 			}
 		},
+		afterShow() {
+			const picker = this.$refs.picker
+			const input = picker.$refs.search.$el.querySelector('input')
+
+			if (input) {
+				input.focus()
+			}
+
+		},
 	},
 }
 </script>
@@ -253,9 +264,16 @@ export default {
 		font-size: inherit;
 		height: 36px;
 		width: auto;
+
 		* {
 			cursor: pointer !important;
 		}
+
+		&:focus {
+			background-color: #f4f4f4;
+			border: 2px solid var(--color-primary) !important;
+			border-radius: 50%;
+		}
 	}
 
 	.emoji-mart-bar,
@@ -309,8 +327,9 @@ export default {
 			flex-basis: calc(100% / 8);
 			text-align: center;
 
-			&:hover::before {
-				background-color: var(--color-background-hover);
+			&:hover::before,
+			&.emoji-mart-emoji-selected::before{
+				outline: 2px solid var(--color-primary);
 			}
 		}
 	}