diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerEditorImpl.java b/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerEditorImpl.java
index b1289957598e..5f9eaa4801df 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerEditorImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerEditorImpl.java
@@ -269,6 +269,7 @@ public abstract class DebuggerEditorImpl extends CompletionEditor{
 
   public void dispose() {
     PsiManager.getInstance(myProject).removePsiTreeChangeListener(myPsiListener);
+    myCurrentDocument = null;
   }
 
   @NotNull