diff --git a/src/components/HoverPopover.svelte b/src/components/HoverPopover.svelte
index da079ce18..1810a8b3a 100644
--- a/src/components/HoverPopover.svelte
+++ b/src/components/HoverPopover.svelte
@@ -133,7 +133,7 @@
     left: 0;
     visibility: hidden;
     border-radius: var(--border-radius-md);
-    z-index: 10;
+    z-index: 400;
   }
 </style>
 
diff --git a/src/components/Popover.svelte b/src/components/Popover.svelte
index 5b443a909..9d2d2c4c6 100644
--- a/src/components/Popover.svelte
+++ b/src/components/Popover.svelte
@@ -101,7 +101,7 @@
     top: 0;
     left: 0;
     visibility: hidden;
-    z-index: 10;
+    z-index: 400;
   }
 </style>
 
diff --git a/src/lib/modal.ts b/src/lib/modal.ts
index cf6f64e15..e5a9b3e93 100644
--- a/src/lib/modal.ts
+++ b/src/lib/modal.ts
@@ -2,6 +2,8 @@ import type { Component, ComponentProps } from "svelte";
 
 import { derived, get, writable } from "svelte/store";
 
+import { closeFocused } from "@app/components/Popover.svelte";
+
 type HideCallback = () => void;
 
 type Modal = {
@@ -66,6 +68,7 @@ export function show<T extends Component<any>>(args: ShowArgs<T>): void {
   if (document.activeElement instanceof HTMLElement) {
     document.activeElement.blur();
   }
+  closeFocused();
   store.set({ ...args, disableScrimClose: args.disableScrimClose ?? false });
 }