diff --git a/MacPass/MPDocumentWindowController.m b/MacPass/MPDocumentWindowController.m
index 08dbae52..ec9a74c6 100644
--- a/MacPass/MPDocumentWindowController.m
+++ b/MacPass/MPDocumentWindowController.m
@@ -383,8 +383,8 @@
 - (void)didSaveDatabaseSettings {
   if (_saveAfterPasswordEdit) {
     _saveAfterPasswordEdit = NO;
+    [[self document] saveDocument:nil];
   }
-  [[self document] saveDocument:nil];
 }
 
 #pragma mark Helper