diff --git a/neode-ui/src/components/BaseModal.vue b/neode-ui/src/components/BaseModal.vue
index 49a1f21e..be7f15a7 100644
--- a/neode-ui/src/components/BaseModal.vue
+++ b/neode-ui/src/components/BaseModal.vue
@@ -50,7 +50,8 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed } from 'vue'
+import { ref, computed, watch } from 'vue'
+import { useRoute } from 'vue-router'
 import { useModalKeyboard } from '@/composables/useModalKeyboard'
 import { useBodyScrollLock } from '@/composables/useBodyScrollLock'
 
@@ -72,6 +73,23 @@ const emit = defineEmits<{
 
 const modalRef = ref<HTMLElement | null>(null)
 
+// A modal must not outlive the screen that raised it. Tab views are
+// KeepAlive'd, so navigating away deactivates the owner rather than
+// unmounting it, and a Teleported modal keeps floating over the destination
+// (seen with the Lightning "Open a channel" / "Setup Guide" actions, which
+// route away from inside the wallet's own modal). Closing on any route change
+// is the general fix — every modal here is a transient dialog.
+//
+// `useRoute()` returns undefined when no router is installed (component
+// tests mount BaseModal bare), so the getter is optional-chained.
+const route = useRoute()
+watch(
+  () => route?.fullPath,
+  (to, from) => {
+    if (to !== from && props.show) emit('close')
+  },
+)
+
 const zClass = computed(() => props.zIndex)
 // The pinned-footer layout needs a height bound or tall content pushes the
 // footer off-screen anyway. Callers that set their own max-h (e.g. the
diff --git a/neode-ui/src/components/__tests__/BaseModal.test.ts b/neode-ui/src/components/__tests__/BaseModal.test.ts
index 3362ed10..1c51f4f3 100644
--- a/neode-ui/src/components/__tests__/BaseModal.test.ts
+++ b/neode-ui/src/components/__tests__/BaseModal.test.ts
@@ -1,5 +1,6 @@
 import { afterEach, describe, expect, it } from 'vitest'
 import { mount } from '@vue/test-utils'
+import { createRouter, createMemoryHistory } from 'vue-router'
 import BaseModal from '../BaseModal.vue'
 
 describe('BaseModal', () => {
@@ -21,4 +22,56 @@ describe('BaseModal', () => {
 
     wrapper.unmount()
   })
+
+  it('closes itself when the route changes', async () => {
+    // Tab views are KeepAlive'd, so navigating away deactivates the owner
+    // rather than unmounting it — a Teleported modal would otherwise keep
+    // floating over the destination screen. Seen with the Lightning modal's
+    // "Open a channel" / "Setup Guide" actions, which route away from inside
+    // the wallet's own send/receive modal.
+    const router = createRouter({
+      history: createMemoryHistory(),
+      routes: [
+        { path: '/', component: { template: '<div />' } },
+        { path: '/elsewhere', component: { template: '<div />' } },
+      ],
+    })
+    await router.push('/')
+    await router.isReady()
+
+    const wrapper = mount(BaseModal, {
+      props: { show: true, title: 'Test modal' },
+      slots: { default: '<p>Modal content</p>' },
+      global: { plugins: [router] },
+    })
+    expect(wrapper.emitted('close')).toBeUndefined()
+
+    await router.push('/elsewhere')
+    await wrapper.vm.$nextTick()
+
+    expect(wrapper.emitted('close')).toHaveLength(1)
+    wrapper.unmount()
+  })
+
+  it('does not emit close on a route change while hidden', async () => {
+    const router = createRouter({
+      history: createMemoryHistory(),
+      routes: [
+        { path: '/', component: { template: '<div />' } },
+        { path: '/elsewhere', component: { template: '<div />' } },
+      ],
+    })
+    await router.push('/')
+    await router.isReady()
+
+    const wrapper = mount(BaseModal, {
+      props: { show: false, title: 'Test modal' },
+      global: { plugins: [router] },
+    })
+    await router.push('/elsewhere')
+    await wrapper.vm.$nextTick()
+
+    expect(wrapper.emitted('close')).toBeUndefined()
+    wrapper.unmount()
+  })
 })
diff --git a/neode-ui/src/composables/useLightningRequired.ts b/neode-ui/src/composables/useLightningRequired.ts
index 4a378525..283c6d69 100644
--- a/neode-ui/src/composables/useLightningRequired.ts
+++ b/neode-ui/src/composables/useLightningRequired.ts
@@ -42,11 +42,13 @@ const status = ref<LightningStatus>('absent')
 const fundingDirection = ref<'send' | 'receive'>('receive')
 
 export function useLightningRequired() {
-  const appStore = useAppStore()
-
+  // The store is resolved lazily, inside the functions that need it, rather
+  // than at composable-call time: a component may legitimately be mounted in
+  // a test (or any context) without an active Pinia, and merely *having* this
+  // gate available must not be what breaks it.
   /** Best status across every known Lightning implementation. */
   function lightningStatus(): LightningStatus {
-    const pkgs = (appStore.packages ?? {}) as Record<string, { state?: string } | undefined>
+    const pkgs = (useAppStore().packages ?? {}) as Record<string, { state?: string } | undefined>
     let best: LightningStatus = 'absent'
     for (const id of LIGHTNING_NODE_APP_IDS) {
       const entry = pkgs[id]