diff --git a/java/java-impl/src/com/intellij/slicer/SliceManager.java b/java/java-impl/src/com/intellij/slicer/SliceManager.java
index e032ce166f24..b6243f347e3a 100644
--- a/java/java-impl/src/com/intellij/slicer/SliceManager.java
+++ b/java/java-impl/src/com/intellij/slicer/SliceManager.java
@@ -126,6 +126,7 @@ public class SliceManager implements PersistentStateComponent<SliceManager.Store
     ToolWindow toolWindow = ToolWindowManager.getInstance(myProject).getToolWindow(dataFlowToThis ? BACK_TOOLWINDOW_ID : FORTH_TOOLWINDOW_ID);
     final SlicePanel slicePanel = new SlicePanel(myProject, dataFlowToThis, rootNode, splitByLeafExpressions, toolWindow) {
       protected void close() {
+        super.close();
         contentManager.removeContent(myContent[0], true);
       }
 
diff --git a/java/java-impl/src/com/intellij/slicer/SlicePanel.java b/java/java-impl/src/com/intellij/slicer/SlicePanel.java
index dcdce16c3b51..96e4aec53ab7 100644
--- a/java/java-impl/src/com/intellij/slicer/SlicePanel.java
+++ b/java/java-impl/src/com/intellij/slicer/SlicePanel.java
@@ -22,6 +22,7 @@ import com.intellij.ide.util.treeView.AbstractTreeNode;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Splitter;
 import com.intellij.openapi.util.Disposer;
@@ -351,7 +352,12 @@ public abstract class SlicePanel extends JPanel implements TypeSafeDataProvider,
     }
   }
 
-  protected abstract void close();
+  protected void close() {
+    final ProgressIndicator progress = myBuilder.getUi().getProgress();
+    if (progress != null) {
+      progress.cancel();
+    }
+  }
 
   private final class MyRefreshAction extends RefreshAction {
     private MyRefreshAction(JComponent tree) {
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/slice/SliceTreeTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/slice/SliceTreeTest.java
index a114c363b27b..03553b1dfc5e 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/slice/SliceTreeTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/slice/SliceTreeTest.java
@@ -6,8 +6,6 @@ import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase;
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
 import com.intellij.ide.util.treeView.AbstractTreeNode;
 import com.intellij.lang.annotation.HighlightSeverity;
-import com.intellij.openapi.projectRoots.Sdk;
-import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.wm.impl.ToolWindowHeadlessManagerImpl;
diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBase.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBase.java
index 6fd72c3b26ac..f8f5ff80d6b6 100644
--- a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBase.java
+++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBase.java
@@ -20,6 +20,7 @@ import com.intellij.ide.actions.CloseTabToolbarAction;
 import com.intellij.ide.actions.ContextHelpAction;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.SimpleToolWindowPanel;
 import com.intellij.pom.Navigatable;
@@ -98,6 +99,7 @@ public abstract class HierarchyBrowserBase extends SimpleToolWindowPanel impleme
   }
 
   protected abstract JTree getCurrentTree();
+  protected abstract HierarchyTreeBuilder getCurrentBuilder();
 
   @Nullable
   protected abstract PsiElement getElementFromDescriptor(@NotNull HierarchyNodeDescriptor descriptor);
@@ -215,6 +217,10 @@ public abstract class HierarchyBrowserBase extends SimpleToolWindowPanel impleme
 
   private final class CloseAction extends CloseTabToolbarAction {
     public final void actionPerformed(final AnActionEvent e) {
+      final ProgressIndicator progress = getCurrentBuilder().getUi().getProgress();
+      if (progress != null) {
+        progress.cancel();
+      }
       myContent.getManager().removeContent(myContent, true);
     }
   }
diff --git a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java
index d14894f66f4b..72232c145afd 100644
--- a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java
+++ b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java
@@ -438,6 +438,10 @@ public class AbstractTreeUi {
     });
   }
 
+  public ProgressIndicator getProgress() {
+    return myProgress;
+  }
+
   private void releaseNow() {
     try {
       acquireLock();