diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewContentManager.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewContentManager.java
index 342056c8607f..030f97347299 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewContentManager.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewContentManager.java
@@ -166,7 +166,7 @@ public class ChangesViewContentManager extends AbstractProjectComponent implemen
   }
   
   public boolean isToolwindowVisible() {
-    return myToolWindow.isVisible();
+    return ! myToolWindow.isDisposed() && myToolWindow.isVisible();
   }
 
   public void projectClosed() {