diff --git a/vite-frontend/src/components/ui/dialog.tsx b/vite-frontend/src/components/ui/dialog.tsx
index 9ba634c..7e91038 100644
--- a/vite-frontend/src/components/ui/dialog.tsx
+++ b/vite-frontend/src/components/ui/dialog.tsx
@@ -62,6 +62,9 @@ function DialogContent({
           className,
         )}
         data-slot="dialog-content"
+        onOpenAutoFocus={(e) => {
+          e.preventDefault();
+        }}
         onCloseAutoFocus={(e) => {
           e.preventDefault();
         }}
diff --git a/vite-frontend/src/shadcn-bridge/heroui/modal.tsx b/vite-frontend/src/shadcn-bridge/heroui/modal.tsx
index fd6244b..dbed70a 100644
--- a/vite-frontend/src/shadcn-bridge/heroui/modal.tsx
+++ b/vite-frontend/src/shadcn-bridge/heroui/modal.tsx
@@ -158,6 +158,9 @@ export function ModalContent({
         className,
       )}
       showCloseButton={false}
+      onOpenAutoFocus={(e) => {
+        e.preventDefault();
+      }}
       onCloseAutoFocus={(e) => {
         e.preventDefault();
       }}