diff --git a/src/pages/settings/Security/TwoFactorAuth/StepWrapper/StepWrapper.tsx b/src/pages/settings/Security/TwoFactorAuth/StepWrapper/StepWrapper.tsx
index 146bdbfff667..7c87d834b274 100644
--- a/src/pages/settings/Security/TwoFactorAuth/StepWrapper/StepWrapper.tsx
+++ b/src/pages/settings/Security/TwoFactorAuth/StepWrapper/StepWrapper.tsx
@@ -41,6 +41,7 @@ function StepWrapper({
         <ScreenWrapper
             shouldShowOfflineIndicator={false}
             shouldEnableKeyboardAvoidingView={shouldEnableKeyboardAvoidingView}
+            shouldEnableMaxHeight
             testID={StepWrapper.displayName}
         >
             <AnimatedStep
diff --git a/src/pages/settings/Security/TwoFactorAuth/Steps/GetCode.tsx b/src/pages/settings/Security/TwoFactorAuth/Steps/GetCode.tsx
index 372df5d17f6d..a36f2e8c7c2f 100644
--- a/src/pages/settings/Security/TwoFactorAuth/Steps/GetCode.tsx
+++ b/src/pages/settings/Security/TwoFactorAuth/Steps/GetCode.tsx
@@ -28,7 +28,6 @@ function GetCode({account}: GetCodeProps) {
     return (
         <StepWrapper
             title={translate('twoFactorAuth.disableTwoFactorAuth')}
-            shouldEnableKeyboardAvoidingView={false}
             onBackButtonPress={() => setStep(CONST.TWO_FACTOR_AUTH_STEPS.ENABLED, CONST.ANIMATION_DIRECTION.OUT)}
             onEntryTransitionEnd={() => formRef.current && formRef.current.focus()}
         >