diff --git a/ui/app/AppLayouts/Chat/ChatColumn/ChatMessages.qml b/ui/app/AppLayouts/Chat/ChatColumn/ChatMessages.qml
index b93896f475..814387c25f 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/ChatMessages.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/ChatMessages.qml
@@ -31,7 +31,6 @@ ScrollView {
 
     ListView {
         property string currentNotificationChatId
-        property bool chatButtonsHovered: false
 
         id: chatLogView
         anchors.fill: parent
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatButtons.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatButtons.qml
index fa6ad75959..0351c9d6cb 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatButtons.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatButtons.qml
@@ -38,11 +38,9 @@ Rectangle {
         hoverEnabled: true
         onEntered: {
             buttonsContainer.hoverChanged(true)
-            chatLogView.chatButtonsHovered = true
         }
         onExited: {
             buttonsContainer.hoverChanged(false)
-            chatLogView.chatButtonsHovered = false
         }
     }
 
@@ -64,7 +62,6 @@ Rectangle {
                 clickMessage(false, false, false, null, true)
             }
             onHoveredChanged: {
-                chatLogView.chatButtonsHovered = this.hovered
                 buttonsContainer.hoverChanged(this.hovered)
             }
 
@@ -85,7 +82,6 @@ Rectangle {
                 showReplyArea()
             }
             onHoveredChanged: {
-                chatLogView.chatButtonsHovered = this.hovered
                 buttonsContainer.hoverChanged(this.hovered)
             }
 
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/CompactMessage.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/CompactMessage.qml
index a1ef9a87d5..a68623b9d5 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/CompactMessage.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/CompactMessage.qml
@@ -32,7 +32,7 @@ Item {
         onHoverChanged: root.isHovered = hovered
         anchors.right: parent.right
         anchors.rightMargin: 20
-        anchors.top: parent.top
+        anchors.top: messageContainer.top
         // This is not exactly like the design because the hover becomes messed up with the buttons on top of another Message
         anchors.topMargin: -Style.current.halfPadding
     }
@@ -68,7 +68,6 @@ Item {
                                                    (hasMention ? Style.current.mentionMessageColor : Style.current.transparent)
 
 
-
         UserImage {
             id: chatImage
             anchors.left: parent.left
@@ -243,9 +242,6 @@ Item {
             root.isHovered = true
         }
         onExited: {
-            if (chatLogView.chatButtonsHovered) {
-                return
-            }
             root.isHovered = false
         }
     }
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/MessageMouseArea.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/MessageMouseArea.qml
index adaac0b442..e9745f563c 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/MessageMouseArea.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/MessageMouseArea.qml
@@ -9,6 +9,7 @@ MouseArea {
     onClicked: {
         if(mouse.button & Qt.RightButton) {
             clickMessage(false, isSticker, false);
+            isMessageActive = true
             return;
         }
         if (mouse.button & Qt.LeftButton) {