diff --git a/vite-frontend/src/shadcn-bridge/heroui/modal.tsx b/vite-frontend/src/shadcn-bridge/heroui/modal.tsx
index 3dab763..fd6244b 100644
--- a/vite-frontend/src/shadcn-bridge/heroui/modal.tsx
+++ b/vite-frontend/src/shadcn-bridge/heroui/modal.tsx
@@ -145,6 +145,7 @@ export function ModalContent({
 
   return (
     <BaseDialogContent
+      {...props}
       className={cn(
         mapSize(resolvedSize),
         context?.classNames?.base,
@@ -157,7 +158,9 @@ export function ModalContent({
         className,
       )}
       showCloseButton={false}
-      {...props}
+      onCloseAutoFocus={(e) => {
+        e.preventDefault();
+      }}
     >
       {renderedChildren}
     </BaseDialogContent>