diff --git a/packages/web/src/javascripts/Components/Modal/ModalOverlay.tsx b/packages/web/src/javascripts/Components/Modal/ModalOverlay.tsx
index 4d5f58a4a..bb87eca26 100644
--- a/packages/web/src/javascripts/Components/Modal/ModalOverlay.tsx
+++ b/packages/web/src/javascripts/Components/Modal/ModalOverlay.tsx
@@ -32,6 +32,11 @@ const ModalOverlay = forwardRef(
         className="fixed top-0 left-0 z-modal h-full w-full"
         ref={mergeRefs([setElement, ref])}
         store={dialog}
+        getPersistentElements={() =>
+          Array.from(document.querySelectorAll('[role="dialog"], [role="alertdialog"]')).map((el) => {
+            return el.parentElement ? el.parentElement : el
+          })
+        }
         {...props}
       >
         {children}