diff --git a/MacPass/MPSheetWindowController.m b/MacPass/MPSheetWindowController.m
index c4bb8ea1..c87a6d09 100644
--- a/MacPass/MPSheetWindowController.m
+++ b/MacPass/MPSheetWindowController.m
@@ -30,7 +30,7 @@
 
 - (void)dismissSheet:(NSInteger)returnCode {
   self.isDirty = YES;
-  [NSApp endSheet:[super window] returnCode:returnCode];
   [[super window] orderOut:self];
+  [NSApp endSheet:[super window] returnCode:returnCode];
 }
 @end