diff --git a/src/apps/stable/routes/quickConnect/index.tsx b/src/apps/stable/routes/quickConnect/index.tsx
index b4dd7d0b9..217b900ae 100644
--- a/src/apps/stable/routes/quickConnect/index.tsx
+++ b/src/apps/stable/routes/quickConnect/index.tsx
@@ -59,6 +59,7 @@ const QuickConnectPage: FC = () => {
             id='quickConnectPreferencesPage'
             title={globalize.translate('QuickConnect')}
             className='mainAnimatedPage libraryPage userPreferencesPage noSecondaryNavPage'
+            shouldAutoFocus
         >
             <div className='padded-left padded-right padded-bottom-page'>
                 <form onSubmit={onSubmitCode}>
diff --git a/src/apps/stable/routes/session/forgotPassword/index.tsx b/src/apps/stable/routes/session/forgotPassword/index.tsx
index ed8942547..abfe1acf1 100644
--- a/src/apps/stable/routes/session/forgotPassword/index.tsx
+++ b/src/apps/stable/routes/session/forgotPassword/index.tsx
@@ -79,6 +79,7 @@ export const ForgotPasswordPage = () => {
         <Page
             id='forgotPasswordPage'
             className='standalonePage forgotPasswordPage mainAnimatedPage'
+            shouldAutoFocus
         >
             <div className='padded-left padded-right padded-bottom-page'>
                 <form
diff --git a/src/controllers/session/resetPassword/index.js b/src/controllers/session/resetPassword/index.js
index 5f553dc25..1941ce569 100644
--- a/src/controllers/session/resetPassword/index.js
+++ b/src/controllers/session/resetPassword/index.js
@@ -39,5 +39,7 @@ export default function (view) {
     }
 
     view.querySelector('form').addEventListener('submit', onSubmit);
+
+    view.querySelector('#txtPin').focus();
 }