diff --git a/public/editor/bridge-core.js b/public/editor/bridge-core.js
index c34e943..dde5ed4 100644
--- a/public/editor/bridge-core.js
+++ b/public/editor/bridge-core.js
@@ -33,6 +33,13 @@
         window.__bridgeModalAllowClose = false;
 
         document.addEventListener('click', (evt) => {
+            const closeHit = evt.target && evt.target.closest
+                ? evt.target.closest('.gjs-mdl-btn-close,[data-bridge-modal-close="1"]')
+                : null;
+            if (closeHit) {
+                window.__bridgeModalAllowClose = true;
+                setTimeout(() => { window.__bridgeModalAllowClose = false; }, 0);
+            }
             const container = evt.target && evt.target.closest
                 ? evt.target.closest('.gjs-mdl-container')
                 : null;
@@ -43,11 +50,6 @@
                     evt.stopPropagation();
                     return;
                 }
-                const closeBtn = evt.target.closest && evt.target.closest('.gjs-mdl-btn-close,[data-bridge-modal-close="1"]');
-                if (closeBtn) {
-                    window.__bridgeModalAllowClose = true;
-                    setTimeout(() => { window.__bridgeModalAllowClose = false; }, 0);
-                }
             }
         }, true);