diff --git a/platform/platform-impl/src/com/intellij/ui/tree/AsyncTreeModel.java b/platform/platform-impl/src/com/intellij/ui/tree/AsyncTreeModel.java
index c17a2db8e020..d83b4f0aff6b 100644
--- a/platform/platform-impl/src/com/intellij/ui/tree/AsyncTreeModel.java
+++ b/platform/platform-impl/src/com/intellij/ui/tree/AsyncTreeModel.java
@@ -770,6 +770,7 @@ public final class AsyncTreeModel extends AbstractTreeModel implements Identifia
       if (object == node.object) return;
       // always use new instance of user's object, because
       // some trees provide equal nodes with different behavior
+      map.remove(node.object);
       node.updatePaths(node.object, object);
       node.object = object;
       map.put(object, node); // update key