diff --git a/frontend/app/components/ui/Popover/Popover.tsx b/frontend/app/components/ui/Popover/Popover.tsx
index 1c1e2a67e..d8a0e260f 100644
--- a/frontend/app/components/ui/Popover/Popover.tsx
+++ b/frontend/app/components/ui/Popover/Popover.tsx
@@ -59,7 +59,7 @@ const Popover = ({ children, render, placement, onOpen = () => {} }: Props) => {
       {open && (
         <FloatingFocusManager
           context={context}
-          modal={false}
+          modal={true}
           order={['reference', 'content']}
           returnFocus={false}
         >