1 files changed, 2 insertions, 3 deletions
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/TreeInplaceEditor.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/TreeInplaceEditor.java
index 3db287f84210..629385c9ad20 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/TreeInplaceEditor.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/TreeInplaceEditor.java
@@ -69,14 +69,13 @@ public abstract class TreeInplaceEditor implements AWTEventListener {
     if (!isShown()) {
       return;
     }
+    myInplaceEditorComponent = null;
     onHidden();
     for (Runnable action : myRemoveActions) {
       action.run();
     }
     myRemoveActions.clear();
 
-    myInplaceEditorComponent = null;
-
     final JTree tree = getTree();
     tree.repaint();
     tree.requestFocus();
@@ -172,7 +171,7 @@ public abstract class TreeInplaceEditor implements AWTEventListener {
       @Override
       public void run() {
         tree.removeHierarchyListener(hierarchyListener);
-        tree.addComponentListener(componentListener);
+        tree.removeComponentListener(componentListener);
         rootPane.removeComponentListener(componentListener);
       }
     });