diff --git a/ChangeLog b/ChangeLog
index 755de732a..5af3df64e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-07  Wolfgang Lux  <wolfgang.lux@gmail.com>
+
+	* Source/NSApplication.m (-finishLaunching): Don't make an
+	invisible window main window when the application has no main
+	window.
+
 2010-12-07  Wolfgang Lux  <wolfgang.lux@gmail.com>
 
 	* Source/NSWindow.m (-sendEvent:): Allow any window that responds
diff --git a/Source/NSApplication.m b/Source/NSApplication.m
index 82c572b8b..3d2d4eb1b 100644
--- a/Source/NSApplication.m
+++ b/Source/NSApplication.m
@@ -1060,7 +1060,7 @@ static NSSize scaledIconSizeForSize(NSSize imageSize)
         {
           NSWindow	*win = [windows_list objectAtIndex: i];
 
-          if ([win canBecomeMainWindow])
+          if ([win isVisible] && [win canBecomeMainWindow])
             {
               _main_window = win;
               break;