diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java
index 1a6ce8b3e8e0..aaf7e09b44c3 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java
@@ -502,7 +502,7 @@ public final class ToolWindowManagerImpl extends ToolWindowManagerEx implements
           ApplicationManager.getApplication().invokeLater(new Runnable() {
             @Override
             public void run() {
-              if (!myProject.isDisposed()) {
+              if (!myProject.isDisposed() && getToolWindow(bean.id) == null) {
                 initToolWindow(bean);
               }
             }