diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 3829399..5efbfdf 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -45,6 +45,15 @@ export default function RootLayout({
         <script
           dangerouslySetInnerHTML={{
             __html: `
+              if ('serviceWorker' in navigator) {
+                navigator.serviceWorker.register('/sw.js', { scope: '/' })
+                  .then(function(reg) {
+                    console.log('[Everclone PWA] Early SW registered, scope:', reg.scope);
+                  })
+                  .catch(function(err) {
+                    console.warn('[Everclone PWA] Early SW registration failed:', err);
+                  });
+              }
               window.__everclone_install_prompt = null;
               window.addEventListener('beforeinstallprompt', function(e) {
                 e.preventDefault();
diff --git a/src/components/PwaRegister.tsx b/src/components/PwaRegister.tsx
index 878c91b..f3a1012 100644
--- a/src/components/PwaRegister.tsx
+++ b/src/components/PwaRegister.tsx
@@ -21,16 +21,22 @@ export default function PwaRegister() {
   useEffect(() => {
     // 1. Register Service Worker for PWA installability and Share Target
     if (typeof window !== 'undefined' && 'serviceWorker' in navigator) {
-      window.addEventListener('load', () => {
+      const registerSW = () => {
         navigator.serviceWorker
-          .register('/sw.js')
+          .register('/sw.js', { scope: '/' })
           .then((registration) => {
             console.log('[Everclone PWA] Service Worker registered (scope):', registration.scope);
           })
           .catch((error) => {
             console.error('[Everclone PWA] Service Worker registration failed:', error);
           });
-      });
+      };
+
+      if (document.readyState === 'complete' || document.readyState === 'interactive') {
+        registerSW();
+      } else {
+        window.addEventListener('load', registerSW);
+      }
     }
 
     // 2. Capture the install prompt for Android / Desktop PWA installation