diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
index 69a3fd0b7dc..f357b531f97 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
@@ -791,6 +791,11 @@ export default {
 
 		// Making sure that the click is outside the MessageButtonsBar
 		handleClickOutside(event) {
+			// check if click is inside the emoji picker
+			if (event.composedPath().some(element => element.classList?.contains('v-popper__popper--shown'))) {
+				return
+			}
+
 			if (event.composedPath().includes(this.$el)) {
 				return
 			}