diff --git a/MacPass/MPPasswordEditWindowController.m b/MacPass/MPPasswordEditWindowController.m
index c4e2ed26..b5378286 100644
--- a/MacPass/MPPasswordEditWindowController.m
+++ b/MacPass/MPPasswordEditWindowController.m
@@ -41,6 +41,7 @@
 - (void)windowDidLoad {
   [super windowDidLoad];
   [self.togglePasswordButton bind:NSValueBinding toObject:self withKeyPath:@"showPassword" options:nil];
+  [[self window] setDefaultButtonCell:[self.changePasswordButton cell]];
 }
 
 - (void)updateView {