diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
index d3b55ffda79..69a3fd0b7dc 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
@@ -246,7 +246,7 @@
 				</template>
 			</NcButton>
 
-			<NcEmojiPicker :container="`${messageContainer} .message-buttons-bar`"
+			<NcEmojiPicker :container="mainContainer"
 				:boundary="boundariesElement"
 				placement="auto"
 				@select="handleReactionClick"
@@ -503,6 +503,10 @@ export default {
 			return this.$store.getters.conversation(this.token)
 		},
 
+		mainContainer() {
+			return this.$store.getters.getMainContainerSelector()
+		},
+
 		messageContainer() {
 			return `#message_${this.id}`
 		},