diff --git a/MasterPassword/ObjC/Mac/MPPasswordWindow.m b/MasterPassword/ObjC/Mac/MPPasswordWindow.m
index 9130baf9..a09ae59f 100644
--- a/MasterPassword/ObjC/Mac/MPPasswordWindow.m
+++ b/MasterPassword/ObjC/Mac/MPPasswordWindow.m
@@ -35,7 +35,7 @@
         [self setLevel:NSScreenSaverWindowLevel];
         [self setFrame:self.screen.frame display:YES];
     }
-    else {
+    else if (self.level != NSNormalWindowLevel) {
         [self setLevel:NSNormalWindowLevel];
         [self setFrame:NSMakeRect( 0, 0, 640, 600) display:NO];
         [self center];