diff --git a/src/screens/Login/FormContainer.tsx b/src/screens/Login/FormContainer.tsx
index a08aa05b..cd17d06d 100644
--- a/src/screens/Login/FormContainer.tsx
+++ b/src/screens/Login/FormContainer.tsx
@@ -29,7 +29,8 @@ export function FormContainer({
   return (
     <ScrollView
       testID={testID}
-      style={[styles.maxHeight, contentContainerStyle]}>
+      style={[styles.maxHeight, contentContainerStyle]}
+      keyboardShouldPersistTaps="handled">
       <View
         style={[a.gap_lg, a.flex_1, !gtMobile && [a.px_lg, a.pt_md], style]}>
         {title && !gtMobile && (
diff --git a/src/screens/Login/SetNewPasswordForm.tsx b/src/screens/Login/SetNewPasswordForm.tsx
index 8fbd798c..0bfe7224 100644
--- a/src/screens/Login/SetNewPasswordForm.tsx
+++ b/src/screens/Login/SetNewPasswordForm.tsx
@@ -113,6 +113,7 @@ export const SetNewPasswordForm = ({
             testID="resetCodeInput"
             label={_(msg`Looks like XXXXX-XXXXX`)}
             autoCapitalize="none"
+            autoFocus={true}
             autoCorrect={false}
             autoComplete="off"
             value={resetCode}