diff --git a/src/lib/components/modal.svelte b/src/lib/components/modal.svelte
index ed85e0cab..410116586 100644
--- a/src/lib/components/modal.svelte
+++ b/src/lib/components/modal.svelte
@@ -3,6 +3,7 @@
     import { trackEvent } from '$lib/actions/analytics';
     import { Form } from '$lib/elements/forms';
     import { disableCommands } from '$lib/commandCenter';
+    import { beforeNavigate } from '$app/navigation';
 
     export let show = false;
     export let size: 'small' | 'big' | 'huge' = null;
@@ -19,6 +20,10 @@
 
     let alert: HTMLElement;
 
+    beforeNavigate(() => {
+        show = false;
+    });
+
     $: $disableCommands(show);
 
     $: if (error) {
diff --git a/tests/unit/setup.ts b/tests/unit/setup.ts
index dfe5637a9..2b65f14eb 100644
--- a/tests/unit/setup.ts
+++ b/tests/unit/setup.ts
@@ -6,7 +6,8 @@ beforeAll(() => {
         browser: true
     }));
     vi.mock('$app/navigation', () => ({
-        goto: vi.fn()
+        goto: vi.fn(),
+        beforeNavigate: vi.fn()
     }));
     vi.mock('$app/environment', () => ({
         dev: true,