diff --git a/Source/NSPanel.m b/Source/NSPanel.m
index 77689eaa1..d5d0d0881 100644
--- a/Source/NSPanel.m
+++ b/Source/NSPanel.m
@@ -241,7 +241,6 @@ static GSAlertPanel	*gmodelAlertPanel = nil;
 		(unsigned)sender);
     }
   active = NO;
-  [self orderOut: self];
   [[NSApplication sharedApplication] stopModal];
 }
 
@@ -410,6 +409,7 @@ static GSAlertPanel	*gmodelAlertPanel = nil;
 {
   active = YES;
   [NSApp runModalForWindow: self];
+  [self orderOut: self];
   return result;
 }