diff --git a/imports/NeoChat/Component/Timeline/TextDelegate.qml b/imports/NeoChat/Component/Timeline/TextDelegate.qml
index 20f3549c9..5d79c8d6c 100644
--- a/imports/NeoChat/Component/Timeline/TextDelegate.qml
+++ b/imports/NeoChat/Component/Timeline/TextDelegate.qml
@@ -62,13 +62,12 @@ a{
         applicationWindow().hoverLinkIndicator.text = "";
     }
 
-    MouseArea {
-        anchors.fill: parent
-        acceptedButtons: spoilerRevealed ? Qt.NoButton : Qt.LeftButton
+    HoverHandler {
         cursorShape: (parent.hoveredLink || !spoilerRevealed) ? Qt.PointingHandCursor : Qt.IBeamCursor
+    }
 
-        TapHandler {
-            onTapped: spoilerRevealed = true
-        }
+    TapHandler {
+        enabled: !parent.hoveredLink && !spoilerRevealed
+        onTapped: spoilerRevealed = true
     }
 }