diff --git a/lnbits/templates/wasm_extension.html b/lnbits/templates/wasm_extension.html
index 7ccd20c58..01f2294f1 100644
--- a/lnbits/templates/wasm_extension.html
+++ b/lnbits/templates/wasm_extension.html
@@ -10,7 +10,10 @@
 </style>
 {% endblock %} {% block page_container %}
 <q-page-container>
-  <q-page class="q-pa-none">
+  <q-page
+    v-if="$route.path.startsWith('{{ normalize_path(request.path) }}')"
+    class="q-pa-none"
+  >
     <iframe
       id="lnbits-wasm-extension-frame"
       class="wasm-extension-frame"
@@ -21,6 +24,13 @@
       referrerpolicy="no-referrer"
     ></iframe>
   </q-page>
+  <q-page v-else class="q-px-md q-py-lg" :class="{'q-px-lg': $q.screen.gt.xs}">
+    <lnbits-wallet-new v-if="g.user && !g.isPublicPage"></lnbits-wallet-new>
+    <lnbits-header-wallets
+      v-if="g.user && !g.isPublicPage"
+    ></lnbits-header-wallets>
+    <router-view :key="$route.path"></router-view>
+  </q-page>
 </q-page-container>
 {% endblock %} {% block scripts %}
 <script>
@@ -38,11 +48,23 @@
 
     function loadExtensionFrame() {
       const frame = extensionFrame()
-      if (!frame || frame.dataset.loaded === 'true') return
+      if (!frame) {
+        bridgePort?.close()
+        bridgePort = null
+        return
+      }
+      if (frame.dataset.loaded === 'true') return
       frame.dataset.loaded = 'true'
       frame.src = frame.dataset.frameUrl
     }
 
+    function startExtensionFrameLoader() {
+      loadExtensionFrame()
+      window.router?.afterEach(() => {
+        window.setTimeout(loadExtensionFrame)
+      })
+    }
+
     function sendResponse(reply, id, payload) {
       reply({
         type: 'lnbits-extension:response',
@@ -182,7 +204,7 @@
         id: message.id
       })
     })
-    window.addEventListener('load', loadExtensionFrame)
+    window.addEventListener('load', startExtensionFrameLoader)
   })()
 </script>
 {% endblock %}