diff --git a/app/screens/login/form.tsx b/app/screens/login/form.tsx
index ac33fc61da6..025d13a4852 100644
--- a/app/screens/login/form.tsx
+++ b/app/screens/login/form.tsx
@@ -331,7 +331,7 @@ const LoginForm = ({config, extra, serverDisplayName, launchError, launchType, l
                 disableFullscreenUI={true}
                 enablesReturnKeyAutomatically={true}
                 error={error}
-                keyboardType='default'
+                keyboardType={isPasswordVisible ? 'visible-password' : 'default'}
                 label={intl.formatMessage({id: 'login.password', defaultMessage: 'Password'})}
                 onChangeText={onPasswordChange}
                 onSubmitEditing={onLogin}