diff --git a/apps/next/src/pages/LockScreen/LockScreen.tsx b/apps/next/src/pages/LockScreen/LockScreen.tsx
index b7c5c5db7..c235864e7 100644
--- a/apps/next/src/pages/LockScreen/LockScreen.tsx
+++ b/apps/next/src/pages/LockScreen/LockScreen.tsx
@@ -57,7 +57,7 @@ export const LockScreen: FC<Props> = ({ unlockWallet }) => {
         </WarningMessage>
       )}
 
-      <Collapse in={isUIReady}>
+      <Collapse in={isUIReady} mountOnEnter unmountOnExit>
         <Unlock
           onUnlock={unlockWallet}
           onForgotPasswordClick={showForgotPasswordModal}
diff --git a/apps/next/src/pages/LockScreen/components/Unlock.tsx b/apps/next/src/pages/LockScreen/components/Unlock.tsx
index 06ec5b638..5cda04002 100644
--- a/apps/next/src/pages/LockScreen/components/Unlock.tsx
+++ b/apps/next/src/pages/LockScreen/components/Unlock.tsx
@@ -45,6 +45,7 @@ export const Unlock: React.FC<Props> = ({
   return (
     <Stack direction="column" width="100cqw" px="20px" mt={8}>
       <PasswordField
+        autoFocus
         onChange={(e) => setPassword(e.target.value)}
         onKeyDown={shortcuts.onKeyDown}
         error={!!error}