diff --git a/src/timeline/AuthorComponent.qml b/src/timeline/AuthorComponent.qml
index 8d2e45e26..4021305b3 100644
--- a/src/timeline/AuthorComponent.qml
+++ b/src/timeline/AuthorComponent.qml
@@ -58,20 +58,19 @@ RowLayout {
             menu.popup(root.QQC2.Overlay.overlay);
         }
 
-        HoverHandler {
-            cursorShape: Qt.PointingHandCursor
-        }
-
         // tapping to open profile
         TapHandler {
             onTapped: RoomManager.resolveResource(root.author.uri)
         }
 
         // right-clicking/long-press for context menu
-        TapHandler {
-            acceptedDevices: PointerDevice.Mouse | PointerDevice.TouchPad | PointerDevice.Stylus
+        MouseArea {
+            anchors.fill: parent
+
             acceptedButtons: Qt.RightButton
-            onTapped: nameButton.openUserMenu()
+            cursorShape: Qt.PointingHandCursor
+
+            onPressed: nameButton.openUserMenu()
         }
         TapHandler {
             acceptedDevices: PointerDevice.TouchScreen
diff --git a/src/timeline/MessageDelegate.qml b/src/timeline/MessageDelegate.qml
index a2c8cba3b..24cced098 100644
--- a/src/timeline/MessageDelegate.qml
+++ b/src/timeline/MessageDelegate.qml
@@ -148,8 +148,8 @@ MessageDelegateBase {
         showBackground: root.cardBackground && !NeoChatConfig.compactLayout
 
         TapHandler {
+            acceptedDevices: PointerDevice.Mouse | PointerDevice.TouchPad | PointerDevice.Stylus
             acceptedButtons: Qt.RightButton
-            gesturePolicy: TapHandler.ReleaseWithinBounds
             onTapped: _private.showMessageMenu()
         }