diff --git a/app/templates/storefront/base.html b/app/templates/storefront/base.html
index 686556e7..339f5179 100644
--- a/app/templates/storefront/base.html
+++ b/app/templates/storefront/base.html
@@ -221,20 +221,30 @@
     </div>
     <style>header { margin-top: 48px !important; }</style>
     <script>
-    // Propagate preview token to all internal links
-    document.addEventListener('DOMContentLoaded', function() {
+    // Propagate preview token to all internal links (runs repeatedly to catch Alpine-rendered content)
+    (function() {
         var params = new URLSearchParams(window.location.search);
         var token = params.get('_preview');
         if (!token) return;
-        document.querySelectorAll('a[href]').forEach(function(a) {
-            var href = a.getAttribute('href');
-            if (href && (href.startsWith('/') || href.startsWith(window.location.origin)) && !href.startsWith('//')) {
+        var baseUrl = '{{ base_url | default("/") }}'.replace(/\/$/, '');
+        function fixLinks() {
+            document.querySelectorAll('a[href]').forEach(function(a) {
+                if (a.dataset.previewFixed) return;
+                var href = a.getAttribute('href');
+                if (!href || href.startsWith('http') || href.startsWith('//') || href.startsWith('#') || href.startsWith('mailto:') || href.startsWith('tel:')) return;
+                // Short paths like /contact from CMS sections → prepend base_url
+                if (href.match(/^\/[a-z]/) && !href.startsWith('/platforms/') && !href.startsWith('/storefront/') && !href.startsWith('/api/') && !href.startsWith('/admin/') && !href.startsWith('/store/')) {
+                    href = baseUrl + href;
+                }
                 var url = new URL(href, window.location.origin);
                 url.searchParams.set('_preview', token);
                 a.setAttribute('href', url.pathname + url.search);
-            }
-        });
-    });
+                a.dataset.previewFixed = '1';
+            });
+        }
+        document.addEventListener('DOMContentLoaded', fixLinks);
+        setInterval(fixLinks, 1000);
+    })();
     </script>
     {% endif %}