diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogData.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogData.java
index f65450a01100..0fbb92edfa52 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogData.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogData.java
@@ -86,7 +86,8 @@ public class VcsLogData implements Disposable, VcsLogDataProvider {
 
   public VcsLogData(@NotNull Project project,
                     @NotNull Map<VirtualFile, VcsLogProvider> logProviders,
-                    @NotNull FatalErrorHandler fatalErrorsConsumer) {
+                    @NotNull FatalErrorHandler fatalErrorsConsumer,
+                    @NotNull Disposable parentDisposable) {
     myProject = project;
     myLogProviders = logProviders;
     myUserRegistry = (VcsUserRegistryImpl)ServiceManager.getService(project, VcsUserRegistry.class);
@@ -125,6 +126,8 @@ public class VcsLogData implements Disposable, VcsLogDataProvider {
                                           this::fireDataPackChangeEvent, FAILING_EXCEPTION_HANDLER, RECENT_COMMITS_COUNT);
 
     myContainingBranchesGetter = new ContainingBranchesGetter(this, this);
+
+    Disposer.register(parentDisposable, this);
   }
 
   @NotNull
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogManager.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogManager.java
index df9f79159691..7c63269ddf54 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogManager.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogManager.java
@@ -73,7 +73,7 @@ public class VcsLogManager implements Disposable {
     myRecreateMainLogHandler = recreateHandler;
 
     Map<VirtualFile, VcsLogProvider> logProviders = findLogProviders(roots, myProject);
-    myLogData = new VcsLogData(myProject, logProviders, new MyFatalErrorsHandler());
+    myLogData = new VcsLogData(myProject, logProviders, new MyFatalErrorsHandler(), this);
     myPostponableRefresher = new PostponableLogRefresher(myLogData);
     myTabsLogRefresher = new VcsLogTabsWatcher(myProject, myPostponableRefresher, myLogData);
 
@@ -174,7 +174,6 @@ public class VcsLogManager implements Disposable {
 
   @Override
   public void dispose() {
-    Disposer.dispose(myLogData);
   }
 
   @NotNull