diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml
index e6186e9d..98adb2a9 100644
--- a/resources/qml/MessageView.qml
+++ b/resources/qml/MessageView.qml
@@ -409,6 +409,8 @@ ScrollView {
 
                 opacity: 0
                 visible: true
+                z: 1
+                enabled: false
                 color: Nheko.colors.highlight
 
                 states: State {
@@ -473,7 +475,7 @@ ScrollView {
             TimelineRow {
                 id: timelinerow
 
-                hovered: wrapper.hovered
+                hovered: (wrapper.hovered && !messageActionHover.hovered) || (messageActions.model != undefined && messageActions.model.eventId == timelinerow.eventId)
 
                 proportionalHeight: wrapper.proportionalHeight
                 type: chat.model, wrapper.type