diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/CompactMessage.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/CompactMessage.qml
index 39a8c03776..8685c5cece 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/CompactMessage.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/CompactMessage.qml
@@ -62,11 +62,14 @@ Item {
         anchors.left: chatText.left
         anchors.leftMargin: 8
         anchors.top: chatReply.bottom
+        z: 51
+
 
         sourceComponent: Component {
             ChatImage {
                 imageSource: image
                 imageWidth: 200
+                onClicked: chatTextItem.clickMessage(false, false, true, image)
             }
         }
     }
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/NormalMessage.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/NormalMessage.qml
index ff75384938..7ed45c8069 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/NormalMessage.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/NormalMessage.qml
@@ -135,16 +135,19 @@ Item {
             anchors.topMargin: Style.current.smallPadding
             anchors.left: parent.left
             anchors.leftMargin: chatBox.chatHorizontalPadding
+            z: 51
 
             sourceComponent: Component {
                 Item {
                     width: chatImageComponent.width + 2 * chatBox.chatHorizontalPadding
                     height: chatImageComponent.height
+
                     ChatImage {
                         id: chatImageComponent
                         imageSource: image
                         imageWidth: 250
                         isCurrentUser: messageItem.isCurrentUser
+                        onClicked: chatTextItem.clickMessage(false, false, true, image)
                     }
                 }
             }