diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEvaluationDialog.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEvaluationDialog.java
index 94875403ab40..49947040683e 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEvaluationDialog.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEvaluationDialog.java
@@ -149,6 +149,12 @@ public class XDebuggerEvaluationDialog extends DialogWrapper {
     init();
   }
 
+  @Override
+  protected void dispose() {
+    super.dispose();
+    myMainPanel.removeAll();
+  }
+
   private void updateSourcePosition() {
     ApplicationManager.getApplication().invokeLater(new Runnable() {
       @Override