diff --git a/components/settings/password-setting.js b/components/settings/password-setting.js
index f8336ec..b9170e7 100644
--- a/components/settings/password-setting.js
+++ b/components/settings/password-setting.js
@@ -59,6 +59,7 @@ export default class PasswordSetting extends Component {
               <View>
                 <TextInput
                   style={styles.passwordField}
+                  autoFocus={true}
                   onChangeText={val => {
                     this.setState({
                       changedPassword: val
@@ -102,6 +103,7 @@ export default class PasswordSetting extends Component {
           <View>
             <TextInput
               style={styles.passwordField}
+              autoFocus={true}
               onChangeText={val => {
                 this.setState({
                   newPassword: val