diff --git a/ui/app/AppLayouts/Chat/views/ChatContentView.qml b/ui/app/AppLayouts/Chat/views/ChatContentView.qml
index 1089dd7967..ef660c722f 100644
--- a/ui/app/AppLayouts/Chat/views/ChatContentView.qml
+++ b/ui/app/AppLayouts/Chat/views/ChatContentView.qml
@@ -387,6 +387,7 @@ ColumnLayout {
             contactsStore: chatContentRoot.contactsStore
             messageContextMenuInst: contextmenu
             messageStore: messageStore
+            emojiPopup: chatContentRoot.emojiPopup
             usersStore: chatContentRoot.usersStore
             stickersLoaded: chatContentRoot.stickersLoaded
             isChatBlocked: chatContentRoot.isBlocked
diff --git a/ui/app/AppLayouts/Chat/views/ChatMessagesView.qml b/ui/app/AppLayouts/Chat/views/ChatMessagesView.qml
index e13c76f8ac..29ea6c9357 100644
--- a/ui/app/AppLayouts/Chat/views/ChatMessagesView.qml
+++ b/ui/app/AppLayouts/Chat/views/ChatMessagesView.qml
@@ -27,6 +27,8 @@ Item {
     property var contactsStore
     property string channelEmoji
 
+    property var emojiPopup
+
     property bool stickersLoaded: false
     property alias chatLogView: chatLogView
     property bool isChatBlocked: false
@@ -246,6 +248,7 @@ Item {
             usersStore: root.usersStore
             contactsStore: root.contactsStore
             channelEmoji: root.channelEmoji
+            emojiPopup: root.emojiPopup
 
             isChatBlocked: root.isChatBlocked
             messageContextMenu: messageContextMenuInst
diff --git a/ui/imports/shared/views/chat/CompactMessageView.qml b/ui/imports/shared/views/chat/CompactMessageView.qml
index 9e848ccc30..59520eaa34 100644
--- a/ui/imports/shared/views/chat/CompactMessageView.qml
+++ b/ui/imports/shared/views/chat/CompactMessageView.qml
@@ -21,6 +21,8 @@ Item {
     property var usersStore
     property var contactsStore
 
+    property var emojiPopup
+
     property var messageContextMenu
     property var container
     property int contentType
@@ -443,6 +445,7 @@ Item {
                     chatInputPlaceholder: qsTrId("type-a-message-")
                     chatType: messageStore.getChatType()
                     isEdit: true
+                    emojiPopup: root.emojiPopup
                     textInput.text: editMessageLoader.sourceText
                     messageContextMenu: root.messageContextMenu
                     onSendMessage: {
diff --git a/ui/imports/shared/views/chat/MessageView.qml b/ui/imports/shared/views/chat/MessageView.qml
index e1d1f542ef..9724579095 100644
--- a/ui/imports/shared/views/chat/MessageView.qml
+++ b/ui/imports/shared/views/chat/MessageView.qml
@@ -24,6 +24,8 @@ Column {
     property var messageContextMenu
     property string channelEmoji
 
+    property var emojiPopup
+
     // Once we redo qml we will know all section/chat related details in each message form the parent components
     // without an explicit need to fetch those details via message store/module.
     property bool isChatBlocked: false
@@ -344,6 +346,7 @@ Column {
             messageContextMenu: root.messageContextMenu
             contentType: root.messageContentType
             isChatBlocked: root.isChatBlocked
+            emojiPopup: root.emojiPopup
 
             communityId: root.communityId
             stickersLoaded: root.stickersLoaded