diff --git a/shared/static/wasm/sx/boot.sx b/shared/static/wasm/sx/boot.sx
index 31dd4691..767400e0 100644
--- a/shared/static/wasm/sx/boot.sx
+++ b/shared/static/wasm/sx/boot.sx
@@ -492,7 +492,23 @@
       (process-elements nil)
       ;; Wire up popstate for back/forward navigation
       (dom-listen (dom-window) "popstate"
-        (fn (e) (handle-popstate 0))))))
+        (fn (e) (handle-popstate 0)))
+      ;; Replay buffered clicks from hydration gap
+      (let ((queued (host-get (dom-window) "_sxQ")))
+        (when queued
+          (let ((arr (host-call (host-global "Array") "from" queued)))
+            (let ((n (host-get arr "length")))
+              (when (> n 0)
+                (log-info (str "replaying " n " buffered click(s)"))
+                (let loop ((i 0))
+                  (when (< i n)
+                    (let ((entry (host-call arr "at" i)))
+                      (when entry
+                        (let ((target (host-get entry "t")))
+                          (when (and target (host-get target "isConnected"))
+                            (host-call target "click")))))
+                    (loop (+ i 1)))))))
+          (host-set! (dom-window) "_sxQ" nil))))))
 
 
 ;; --------------------------------------------------------------------------
diff --git a/shared/sx/templates/shell.sx b/shared/sx/templates/shell.sx
index 1c2ef892..cedf396d 100644
--- a/shared/sx/templates/shell.sx
+++ b/shared/sx/templates/shell.sx
@@ -76,6 +76,8 @@ details.group{overflow:hidden}details.group>summary{list-style:none}details.grou
       (body :class "bg-stone-50 text-stone-900"
         ;; Server-rendered HTML — visible immediately before JS loads
         (div :id "sx-root" (raw! (or body-html "")))
+        ;; Event buffer — captures clicks during hydration gap, replayed after boot
+        (script (raw! "document.addEventListener('click',function(e){var i=e.target.closest('[data-sx-island]');if(i&&!i._sxBoundislandHydrated){e.stopPropagation();(window._sxQ=window._sxQ||[]).push({t:e.target,ts:Date.now()})}},true)"))
         (script :type "text/sx" :data-components true :data-hash component-hash
           (raw! (or component-defs "")))
         (when init-sx
diff --git a/web/boot.sx b/web/boot.sx
index 31dd4691..767400e0 100644
--- a/web/boot.sx
+++ b/web/boot.sx
@@ -492,7 +492,23 @@
       (process-elements nil)
       ;; Wire up popstate for back/forward navigation
       (dom-listen (dom-window) "popstate"
-        (fn (e) (handle-popstate 0))))))
+        (fn (e) (handle-popstate 0)))
+      ;; Replay buffered clicks from hydration gap
+      (let ((queued (host-get (dom-window) "_sxQ")))
+        (when queued
+          (let ((arr (host-call (host-global "Array") "from" queued)))
+            (let ((n (host-get arr "length")))
+              (when (> n 0)
+                (log-info (str "replaying " n " buffered click(s)"))
+                (let loop ((i 0))
+                  (when (< i n)
+                    (let ((entry (host-call arr "at" i)))
+                      (when entry
+                        (let ((target (host-get entry "t")))
+                          (when (and target (host-get target "isConnected"))
+                            (host-call target "click")))))
+                    (loop (+ i 1)))))))
+          (host-set! (dom-window) "_sxQ" nil))))))
 
 
 ;; --------------------------------------------------------------------------