diff --git a/platform/projectModel-impl/src/com/intellij/core/CoreModule.java b/platform/projectModel-impl/src/com/intellij/core/CoreModule.java
index 7c5544c7e511..adc0f3ef0c52 100644
--- a/platform/projectModel-impl/src/com/intellij/core/CoreModule.java
+++ b/platform/projectModel-impl/src/com/intellij/core/CoreModule.java
@@ -61,10 +61,16 @@ public class CoreModule extends MockComponentManager implements ModuleEx {
       }
     });
 
-    ModuleRootManagerImpl moduleRootManager = new ModuleRootManagerImpl(this,
+    final ModuleRootManagerImpl moduleRootManager = new ModuleRootManagerImpl(this,
                                                                         DirectoryIndex.getInstance(project),
                                                                         ProjectRootManagerImpl.getInstanceImpl(project),
                                                                         VirtualFilePointerManager.getInstance());
+    Disposer.register(parentDisposable, new Disposable() {
+      @Override
+      public void dispose() {
+        moduleRootManager.disposeComponent();
+      }
+    });
     getPicoContainer().registerComponentInstance(ModuleRootManager.class, moduleRootManager);
     getPicoContainer().registerComponentInstance(PathMacroManager.class, new ModulePathMacroManager(PathMacros.getInstance(), this));
     myModuleScopeProvider = createModuleScopeProvider();