diff --git a/js/ui/components/VideoCard.js b/js/ui/components/VideoCard.js
index a9bdf0a5..f7b781ca 100644
--- a/js/ui/components/VideoCard.js
+++ b/js/ui/components/VideoCard.js
@@ -1420,16 +1420,35 @@ export class VideoCard {
         event.preventDefault();
         event.stopPropagation();
 
+        const trigger = this.settingsButton;
+        const isExpanded =
+          typeof trigger?.getAttribute === "function" &&
+          trigger.getAttribute("aria-expanded") === "true";
+
         if (this.onRequestCloseAllMenus) {
-          this.onRequestCloseAllMenus({ restoreFocus: false });
-        } else {
+          const options = { restoreFocus: false };
+          if (isExpanded) {
+            options.skipCard = this;
+            options.skipTrigger = trigger;
+          }
+          this.onRequestCloseAllMenus(options);
+        } else if (!isExpanded) {
+          this.closeMoreMenu({ restoreFocus: false });
           this.closeSettingsMenu({ restoreFocus: false });
         }
 
+        if (isExpanded) {
+          this.closeMoreMenu({ restoreFocus: false });
+          this.closeSettingsMenu({ restoreFocus: false });
+          return;
+        }
+
+        this.closeMoreMenu({ restoreFocus: false });
+
         if (this.callbacks.onRequestSettingsMenu) {
           const detail = {
             event,
-            trigger: this.settingsButton,
+            trigger,
             video: this.video,
             card: this,
             index: this.index,
diff --git a/js/ui/components/VideoModal.js b/js/ui/components/VideoModal.js
index 3d3a56e7..b195788d 100644
--- a/js/ui/components/VideoModal.js
+++ b/js/ui/components/VideoModal.js
@@ -411,6 +411,15 @@ export class VideoModal {
         if (this.modalZapBtn?.disabled) {
           return;
         }
+
+        const isExpanded =
+          this.modalZapBtn.getAttribute("aria-expanded") === "true";
+
+        if (isExpanded) {
+          this.closeZapDialog();
+          return;
+        }
+
         this.openZapDialog();
         this.dispatch("zap:open", { video: this.activeVideo });
       });