diff --git a/MacPass/MPPasswordEditWindowController.h b/MacPass/MPPasswordEditWindowController.h
index 53da6575..bb5fbb99 100644
--- a/MacPass/MPPasswordEditWindowController.h
+++ b/MacPass/MPPasswordEditWindowController.h
@@ -30,6 +30,7 @@
 @property (weak) IBOutlet NSButton *togglePasswordButton;
 @property (weak) IBOutlet NSTextField *errorTextField;
 @property (weak) IBOutlet NSButton *changePasswordButton;
+@property (weak) IBOutlet NSButton *hasPasswordSwitchButton;
 @property (nonatomic,assign) BOOL allowsEmptyPasswordOrKey;
 
 @property (weak) id<MPPasswordEditWindowDelegate> delegate;
diff --git a/MacPass/MPPasswordEditWindowController.m b/MacPass/MPPasswordEditWindowController.m
index 7f7f3ced..049c9dde 100644
--- a/MacPass/MPPasswordEditWindowController.m
+++ b/MacPass/MPPasswordEditWindowController.m
@@ -56,8 +56,10 @@
   
   NSDictionary *negateOption = @{ NSValueTransformerNameBindingOption : NSNegateBooleanTransformerName };
   [self.passwordTextField bind:@"showPassword" toObject:self withKeyPath:@"showPassword" options:nil];
+  [self.passwordTextField bind:NSEnabledBinding toObject:self.hasPasswordSwitchButton withKeyPath:@"cell.state" options:nil];
   [self.togglePasswordButton bind:NSValueBinding toObject:self withKeyPath:@"showPassword" options:nil];
   [self.passwordRepeatTextField bind:NSEnabledBinding toObject:self withKeyPath:@"showPassword" options:negateOption];
+  [self.passwordRepeatTextField bind:NSEnabledBinding toObject:self.hasPasswordSwitchButton withKeyPath:@"cell.state" options:nil];
   [self.errorTextField bind:NSHiddenBinding toObject:self withKeyPath:@"hasValidPasswordOrKey" options:nil];
   [self.changePasswordButton bind:NSEnabledBinding toObject:self withKeyPath:@"hasValidPasswordOrKey" options:nil];
   [self.keyfilePathControl bind:NSValueBinding toObject:self withKeyPath:@"keyURL" options:nil];
diff --git a/MacPass/PasswordEditWindow.xib b/MacPass/PasswordEditWindow.xib
index fefc4d70..0efb2247 100644
--- a/MacPass/PasswordEditWindow.xib
+++ b/MacPass/PasswordEditWindow.xib
@@ -9,6 +9,7 @@
             <connections>
                 <outlet property="changePasswordButton" destination="68" id="85"/>
                 <outlet property="errorTextField" destination="12" id="79"/>
+                <outlet property="hasPasswordSwitchButton" destination="yKc-I9-uzv" id="aUH-R4-WwP"/>
                 <outlet property="keyfilePathControl" destination="4" id="63"/>
                 <outlet property="passwordRepeatTextField" destination="11" id="62"/>
                 <outlet property="passwordTextField" destination="9" id="61"/>