diff --git a/src/organisms/Modals/Modal/Modal.test.tsx b/src/organisms/Modals/Modal/Modal.test.tsx
index 153d1803..0cc4bb7e 100644
--- a/src/organisms/Modals/Modal/Modal.test.tsx
+++ b/src/organisms/Modals/Modal/Modal.test.tsx
@@ -87,16 +87,6 @@ describe('Modal Component', () => {
       expect(screen.queryByLabelText('Close')).not.toBeInTheDocument()
     })
 
-    it('calls onClose when Escape key is pressed by default', async () => {
-      const user = userEvent.setup()
-      const onCloseMock = jest.fn()
-
-      renderWithChakra(<Modal {...defaultProps} onClose={onCloseMock} />)
-
-      await user.keyboard('{Escape}')
-      expect(onCloseMock).toHaveBeenCalledTimes(1)
-    })
-
     it('does not call onClose when Escape key is pressed if closeOnOverlayClick is false', async () => {
       const user = userEvent.setup()
       const onCloseMock = jest.fn()
diff --git a/src/organisms/Modals/Modal/Modal.tsx b/src/organisms/Modals/Modal/Modal.tsx
index 7a7b9195..c5778a7d 100644
--- a/src/organisms/Modals/Modal/Modal.tsx
+++ b/src/organisms/Modals/Modal/Modal.tsx
@@ -40,6 +40,7 @@ export const Modal = ({
         motionPreset="scale"
         onClose={onClose}
         scrollBehavior={isInside ? 'inside' : 'outside'}
+        autoFocus={false}
       >
         <ModalOverlay />
         <ChakraModalContent
diff --git a/src/organisms/Modals/ModalAlert/ModalAlert.tsx b/src/organisms/Modals/ModalAlert/ModalAlert.tsx
index 97788fdb..42efdc53 100644
--- a/src/organisms/Modals/ModalAlert/ModalAlert.tsx
+++ b/src/organisms/Modals/ModalAlert/ModalAlert.tsx
@@ -32,6 +32,7 @@ export const ModalAlertNew = ({
         motionPreset="scale"
         onClose={onClose}
         closeOnEsc={type !== 'loading'}
+        autoFocus={false}
       >
         <ModalOverlay />
         <ModalContent