diff --git a/js/ui/components/hashtagStripHelper.js b/js/ui/components/hashtagStripHelper.js
index 35d1a849..6dc2dde5 100644
--- a/js/ui/components/hashtagStripHelper.js
+++ b/js/ui/components/hashtagStripHelper.js
@@ -243,10 +243,16 @@ export class HashtagStripHelper {
     }
 
     try {
+      const trigger =
+        detail?.button ||
+        detail?.event?.currentTarget ||
+        detail?.event?.target?.closest?.("button[data-tag]") ||
+        null;
       this.activateHandler({
         tag,
         event: detail?.event || null,
-        trigger: detail?.button || null,
+        trigger,
+        button: trigger,
         context: this.context,
       });
     } catch (error) {
diff --git a/js/ui/views/VideoListView.js b/js/ui/views/VideoListView.js
index e25d329d..51871bc9 100644
--- a/js/ui/views/VideoListView.js
+++ b/js/ui/views/VideoListView.js
@@ -1289,8 +1289,13 @@ export class VideoListView {
       detail && typeof detail === "object" ? detail : { tag: detail };
     const tag = candidate.tag;
     const event = candidate.event || options.event || null;
-    const trigger =
-      candidate.trigger || candidate.button || options.button || null;
+    let trigger = candidate.trigger || candidate.button || options.button || null;
+    if (!trigger && event && event.target) {
+      trigger =
+        event.target.closest?.("button[data-tag]") ||
+        event.currentTarget ||
+        null;
+    }
     const context =
       typeof candidate.context === "string" && candidate.context
         ? candidate.context