diff --git a/components/settings/password/enter-new-password.js b/components/settings/password/enter-new-password.js
index 7ce4733..33c4c28 100644
--- a/components/settings/password/enter-new-password.js
+++ b/components/settings/password/enter-new-password.js
@@ -79,7 +79,11 @@ export default class EnterNewPassword extends Component {
         {shouldShowErrorMessage && (
           <AppText style={styles.error}>{labels.passwordsDontMatch}</AppText>
         )}
-        <Button isCTA={isButtonActive} onPress={this.savePassword}>
+        <Button
+          isCTA={isButtonActive}
+          disabled={!isButtonActive}
+          onPress={this.savePassword}
+        >
           {labels.savePassword}
         </Button>
       </React.Fragment>