diff --git a/platform/platform-impl/src/com/intellij/ui/EditorTextField.java b/platform/platform-impl/src/com/intellij/ui/EditorTextField.java
index 456c2c8231cf..817628afdf5f 100644
--- a/platform/platform-impl/src/com/intellij/ui/EditorTextField.java
+++ b/platform/platform-impl/src/com/intellij/ui/EditorTextField.java
@@ -372,7 +372,9 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener,
   @Override
   public void removeNotify() {
     super.removeNotify();
-    Disposer.dispose(myDisposable);
+    if (myDisposable != null) {
+      Disposer.dispose(myDisposable);
+    }
   }
 
   private void releaseEditor(Editor editor) {