diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowManagerImpl.java
index c96f5501a93a..d1aa0f2a33a5 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowManagerImpl.java
@@ -623,8 +623,13 @@ public final class WindowManagerImpl extends WindowManagerEx implements Applicat
     frame.setFileTitle(null, null);
 
     myProject2Frame.remove(project);
-    Disposer.dispose(frame.getStatusBar());
-    frame.dispose();
+    if (myProject2Frame.isEmpty()) {
+      myProject2Frame.put(null, frame);
+    }
+    else {
+      Disposer.dispose(frame.getStatusBar());
+      frame.dispose();
+    }
   }
 
   public final void disposeRootFrame() {