diff --git a/components/common/app-text-input.js b/components/common/app-text-input.js
index 3ec9369..3a50ed2 100644
--- a/components/common/app-text-input.js
+++ b/components/common/app-text-input.js
@@ -4,11 +4,14 @@ import PropTypes from 'prop-types'
 
 import { Colors, Spacing, Typography } from '../../styles'
 
-const AppTextInput = ({ style, ...props }) => {
+const AppTextInput = ({ style, isKeyboardOffset, ...props }) => {
+  const behavior = isKeyboardOffset ? "padding" : "height"
+  const keyboardVerticalOffset = isKeyboardOffset ? 300 : 0
+
   return (
     <KeyboardAvoidingView
-      behavior="padding"
-      keyboardVerticalOffset={300}
+      behavior={behavior}
+      keyboardVerticalOffset={keyboardVerticalOffset}
     >
       <TextInput style={[styles.input, style]} {...props} />
     </KeyboardAvoidingView>
@@ -16,7 +19,12 @@ const AppTextInput = ({ style, ...props }) => {
 }
 
 AppTextInput.propTypes = {
-  style: PropTypes.object
+  style: PropTypes.object,
+  isKeyboardOffset: PropTypes.bool,
+}
+
+AppTextInput.defultProps = {
+  isKeyboardOffset: true,
 }
 
 const styles = StyleSheet.create({
diff --git a/components/password-prompt.js b/components/password-prompt.js
index 2924b46..4190312 100644
--- a/components/password-prompt.js
+++ b/components/password-prompt.js
@@ -89,6 +89,7 @@ export default class PasswordPrompt extends Component {
         <Header isSideMenuEnabled={false} />
         <AppPage contentContainerStyle={styles.contentContainer}>
           <AppTextInput
+            isKeyboardOffset={false}
             onChangeText={this.setPassword}
             secureTextEntry={true}
             placeholder={labels.enterPassword}
diff --git a/components/settings/password/enter-new-password.js b/components/settings/password/enter-new-password.js
index a351099..15f5d08 100644
--- a/components/settings/password/enter-new-password.js
+++ b/components/settings/password/enter-new-password.js
@@ -65,6 +65,7 @@ export default class EnterNewPassword extends Component {
     return (
       <React.Fragment>
         <AppTextInput
+          isKeyboardOffset={false}
           onChangeText={this.handlePasswordInput}
           placeholder={labels.enterNew}
           textContentType="password"
@@ -72,6 +73,7 @@ export default class EnterNewPassword extends Component {
           secureTextEntry={true}
         />
         <AppTextInput
+          isKeyboardOffset={false}
           onChangeText={this.handleConfirmationInput}
           placeholder={labels.confirmPassword}
           textContentType="password"