diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/LineStatusTrackerManager.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/LineStatusTrackerManager.java
index 067f50a0b31c..1815bf9c9491 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/LineStatusTrackerManager.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/LineStatusTrackerManager.java
@@ -150,24 +150,16 @@ public class LineStatusTrackerManager implements ProjectComponent, LineStatusTra
         final EditorColorsListener editorColorsListener = new MyEditorColorsListener();
 
         final FileStatusManager fsManager = FileStatusManager.getInstance(myProject);
-        fsManager.addFileStatusListener(fileStatusListener, myProject);
+        fsManager.addFileStatusListener(fileStatusListener, myDisposable);
 
         final EditorFactory editorFactory = EditorFactory.getInstance();
-        editorFactory.addEditorFactoryListener(editorFactoryListener,myProject);
+        editorFactory.addEditorFactoryListener(editorFactoryListener, myDisposable);
 
         final VirtualFileManager virtualFileManager = VirtualFileManager.getInstance();
-        virtualFileManager.addVirtualFileListener(virtualFileListener,myProject);
+        virtualFileManager.addVirtualFileListener(virtualFileListener, myDisposable);
 
         final EditorColorsManager editorColorsManager = EditorColorsManager.getInstance();
-        editorColorsManager.addEditorColorsListener(editorColorsListener);
-
-        Disposer.register(myDisposable, new Disposable() {
-          public void dispose() {
-            fsManager.removeFileStatusListener(fileStatusListener);
-            virtualFileManager.removeVirtualFileListener(virtualFileListener);
-            editorColorsManager.removeEditorColorsListener(editorColorsListener);
-          }
-        });
+        editorColorsManager.addEditorColorsListener(editorColorsListener, myDisposable);
       }
     });
   }