diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/resources/impl/ResourceManager.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/resources/impl/ResourceManager.java
index b7eb5cc53a..7fa39343bf 100644
--- a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/resources/impl/ResourceManager.java
+++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/resources/impl/ResourceManager.java
@@ -1112,8 +1112,10 @@ public final class ResourceManager {
   }
 
   private Promise<Void> onExternalDeltaMoved(final ResourceDelta delta) {
-    final Optional<Resource> toRemove = store.getResource(delta.getFromPath());
-    store.dispose(delta.getFromPath(), true);
+      Optional<Resource> toRemove = store.getResource(delta.getFromPath());
+      Path pathToDispose = Path.commonPath(delta.getFromPath(), delta.getToPath());
+
+      store.dispose(pathToDispose, true);
 
     return findResource(delta.getToPath())
         .thenPromise(