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 42d86b531d93..4dee42198d72 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
@@ -371,6 +371,12 @@ public final class ToolWindowManagerImpl extends ToolWindowManagerEx implements
 
   @Override
   public void disposeComponent() {
+    for (String id : new ArrayList<String>(myId2StripeButton.keySet())) {
+      unregisterToolWindow(id);
+    }
+
+    assert myId2StripeButton.isEmpty();
+
     KeyboardFocusManager.getCurrentKeyboardFocusManager().removePropertyChangeListener(myFocusListener);
   }