diff --git a/plugins/coverage-common/src/com/intellij/coverage/view/CoverageView.java b/plugins/coverage-common/src/com/intellij/coverage/view/CoverageView.java
index 7501aaae9243..f4047a63da2e 100644
--- a/plugins/coverage-common/src/com/intellij/coverage/view/CoverageView.java
+++ b/plugins/coverage-common/src/com/intellij/coverage/view/CoverageView.java
@@ -150,6 +150,9 @@ public class CoverageView extends BorderLayoutPanel implements DataProvider, Dis
 
   @Override
   public void dispose() {
+    if (!myProject.isDisposed()) {
+      CoverageDataManager.getInstance(myProject).chooseSuitesBundle(null);
+    }
   }
 
   private static ActionGroup createPopupGroup() {
diff --git a/plugins/coverage-common/src/com/intellij/coverage/view/CoverageViewManager.java b/plugins/coverage-common/src/com/intellij/coverage/view/CoverageViewManager.java
index 212f10a314e0..a6c9c0a1ca7b 100644
--- a/plugins/coverage-common/src/com/intellij/coverage/view/CoverageViewManager.java
+++ b/plugins/coverage-common/src/com/intellij/coverage/view/CoverageViewManager.java
@@ -91,8 +91,6 @@ public class CoverageViewManager implements PersistentStateComponent<CoverageVie
   }
 
   public void createToolWindow(String displayName, boolean defaultFileProvider) {
-    closeView(displayName);
-
     final CoverageView coverageView = new CoverageView(myProject, myDataManager, myStateBean);
     myViews.put(displayName, coverageView);
     Content content = myContentManager.getFactory().createContent(coverageView, displayName, true);