diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XVariablesView.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XVariablesView.java
index b75002919dce..4b5a5f8bca3e 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XVariablesView.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XVariablesView.java
@@ -68,12 +68,22 @@ public class XVariablesView extends XVariablesViewBase {
   }
 
   @Override
-  protected void clear() {
-    XDebuggerTree tree = getTree();
+  public void dispose() {
+    clearInlineData(getTree());
+    super.dispose();
+  }
+
+  private static void clearInlineData(XDebuggerTree tree) {
     tree.getProject().putUserData(DEBUG_VARIABLES, null);
     tree.getProject().putUserData(DEBUG_VARIABLES_TIMESTAMPS, null);
-    tree.setSourcePosition(null);
     tree.updateEditor();
+  }
+
+  @Override
+  protected void clear() {
+    XDebuggerTree tree = getTree();
+    tree.setSourcePosition(null);
+    clearInlineData(tree);
 
     XDebuggerTreeNode node;
     XDebugSession session = getSession(getPanel());