From 6bea19f54ac3538a372a546e86a884512d54e02e Mon Sep 17 00:00:00 2001
From: Bradley Eaton <bradley@bradleyeaton.com>
Date: Sat, 19 Jul 2025 14:22:36 +0100
Subject: [PATCH 1/2] Fix a couple focus issues in TV layout with keyboard
 navigation.

---
 src/apps/stable/routes/quickConnect/index.tsx           | 1 +
 src/apps/stable/routes/session/forgotPassword/index.tsx | 1 +
 2 files changed, 2 insertions(+)

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

From 0c6f582f28be628e92d23e9cbdf509e14aeb96a1 Mon Sep 17 00:00:00 2001
From: Bradley Eaton <bradley@bradleyeaton.com>
Date: Fri, 1 Aug 2025 16:40:13 +0100
Subject: [PATCH 2/2] Focus pin code text field on password reset.

---
 src/controllers/session/resetPassword/index.js | 2 ++
 1 file changed, 2 insertions(+)

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();
 }