diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreeBase.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreeBase.java
index 839eaaf8ce93..09c46fc82966 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreeBase.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreeBase.java
@@ -366,6 +366,12 @@ public class DebuggerTreeBase extends DnDAwareTree implements Disposable {
   }
 
   public void dispose() {
+    final JComponent tooltip = myCurrentTooltip;
+    if (tooltip != null) {
+      tooltip.setVisible(false);
+    }
+    myCurrentTooltip = null;
+    myCurrentTooltipNode = null;
     Disposer.dispose(myTipManager);
   }