diff --git a/web/src/ui/timeline/TimelineEvent.tsx b/web/src/ui/timeline/TimelineEvent.tsx
index 23efe9c..f4a7ae8 100644
--- a/web/src/ui/timeline/TimelineEvent.tsx
+++ b/web/src/ui/timeline/TimelineEvent.tsx
@@ -106,6 +106,8 @@ const TimelineEvent = ({ evt, prevEvt, disableMenu, smallReplies, isFocused }: T
 		if (
 			targetElem.tagName === "A"
 			|| targetElem.tagName === "IMG"
+			|| targetElem.tagName === "VIDEO"
+			|| targetElem.tagName === "SUMMARY"
 		) {
 			return
 		}
diff --git a/web/src/ui/timeline/content/TextMessageBody.tsx b/web/src/ui/timeline/content/TextMessageBody.tsx
index 03cfdd2..6002d86 100644
--- a/web/src/ui/timeline/content/TextMessageBody.tsx
+++ b/web/src/ui/timeline/content/TextMessageBody.tsx
@@ -58,9 +58,11 @@ const onClickHTML = (evt: React.MouseEvent<HTMLDivElement>) => {
 	} else if (targetElem.closest?.("span.hicli-spoiler")?.classList.toggle("spoiler-revealed")) {
 		// When unspoilering, don't trigger links and other clickables inside the spoiler
 		evt.preventDefault()
+		evt.stopPropagation()
 	} else if (isAnchorElement(targetElem) && targetElem.href.startsWith("matrix:")) {
 		onClickMatrixURI(targetElem.href)
 		evt.preventDefault()
+		evt.stopPropagation()
 	}
 }