diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/WatchInplaceEditor.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/WatchInplaceEditor.java
index 235c689c4310..543b57423b50 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/WatchInplaceEditor.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/WatchInplaceEditor.java
@@ -54,6 +54,7 @@ public class WatchInplaceEditor extends XDebuggerTreeInplaceEditor {
   }
 
   public void cancelEditing() {
+    if (!isShown()) return;
     super.cancelEditing();
     int index = myRootNode.removeChildNode(getNode());
     if (myOldNode != null) {