diff --git a/macosx/Controller.m b/macosx/Controller.m
index 915b9fc1d..6408c6f2f 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -234,7 +234,7 @@ static void sleepCallBack(void * controller, io_service_t y,
 
 - (BOOL) applicationShouldHandleReopen: (NSApplication *) app hasVisibleWindows: (BOOL) visibleWindows
 {
-    if (!visibleWindows)
+    if (![fWindow isVisible] && ![[fPrefsController window] isVisible])
         [fWindow makeKeyAndOrderFront: nil];
     return NO;
 }