Index: trunk/src/org/openstreetmap/josm/gui/SplashScreen.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/SplashScreen.java	(revision 1092)
+++ trunk/src/org/openstreetmap/josm/gui/SplashScreen.java	(revision 1093)
@@ -4,4 +4,5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.AWTEvent;
 import java.awt.Color;
 import java.awt.Dimension;
@@ -11,4 +12,5 @@
 import java.awt.Insets;
 import java.awt.Toolkit;
+import java.awt.event.AWTEventListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
@@ -120,6 +122,18 @@
 			}
 		});
+		
+        // Hide splashscreen when other window is created
+		Toolkit.getDefaultToolkit().addAWTEventListener(awtListener, AWTEvent.WINDOW_EVENT_MASK);
+		
 		setVisible(true);
 	}
+	
+	private AWTEventListener awtListener = new AWTEventListener() {
+		public void eventDispatched(AWTEvent event) {
+			if (event.getSource() != SplashScreen.this) {
+				closeSplash();
+			}
+		}		
+	};
 
 	/**
@@ -142,6 +156,7 @@
 		if (!visible)
 			return;
+		Toolkit.getDefaultToolkit().removeAWTEventListener(awtListener);
 		try {
-			SwingUtilities.invokeAndWait(closerRunner);
+			SwingUtilities.invokeLater(closerRunner);
 		} catch (Exception e) {
 			e.printStackTrace();