diff --git a/platform/diff-impl/src/com/intellij/diff/impl/CacheDiffRequestChainProcessor.java b/platform/diff-impl/src/com/intellij/diff/impl/CacheDiffRequestChainProcessor.java
index 63aabc7bf446..1a9a42dbd0b4 100644
--- a/platform/diff-impl/src/com/intellij/diff/impl/CacheDiffRequestChainProcessor.java
+++ b/platform/diff-impl/src/com/intellij/diff/impl/CacheDiffRequestChainProcessor.java
@@ -138,7 +138,7 @@ public abstract class CacheDiffRequestChainProcessor extends DiffRequestProcesso
   @CalledInAwt
   protected void onDispose() {
     super.onDispose();
-    Disposer.dispose(myQueue);
+    myQueue.abort();
     myRequestCache.clear();
   }
 
diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffViewerBase.java b/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffViewerBase.java
index 836f8b0ac338..580239244dc0 100644
--- a/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffViewerBase.java
+++ b/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffViewerBase.java
@@ -31,6 +31,7 @@ import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.util.ProgressWindow;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Disposer;
+import com.intellij.util.Alarm;
 import com.intellij.util.Function;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.*;
@@ -46,6 +47,7 @@ public abstract class DiffViewerBase implements DiffViewer, DataProvider {
   @NotNull protected final ContentDiffRequest myRequest;
 
   @NotNull private final DiffTaskQueue myTaskExecutor = new DiffTaskQueue();
+  @NotNull private final Alarm myTaskAlarm = new Alarm();
   private volatile boolean myDisposed;
 
   public DiffViewerBase(@NotNull DiffContext context, @NotNull ContentDiffRequest request) {
@@ -78,6 +80,7 @@ public abstract class DiffViewerBase implements DiffViewer, DataProvider {
         if (myDisposed) return;
         myDisposed = true;
 
+        abortRediff();
         onDispose();
       }
     };
@@ -90,7 +93,8 @@ public abstract class DiffViewerBase implements DiffViewer, DataProvider {
   public final void scheduleRediff() {
     if (isDisposed()) return;
 
-    myTaskExecutor.abortAndSchedule(new Runnable() {
+    abortRediff();
+    myTaskAlarm.addRequest(new Runnable() {
       @Override
       public void run() {
         rediff();
@@ -101,6 +105,7 @@ public abstract class DiffViewerBase implements DiffViewer, DataProvider {
   @CalledInAwt
   public final void abortRediff() {
     myTaskExecutor.abort();
+    myTaskAlarm.cancelAllRequests();
   }
 
   @CalledInAwt
@@ -197,7 +202,7 @@ public abstract class DiffViewerBase implements DiffViewer, DataProvider {
 
   @CalledInAwt
   protected void onDispose() {
-    Disposer.dispose(myTaskExecutor);
+    Disposer.dispose(myTaskAlarm);
   }
 
   @Nullable
diff --git a/platform/diff-impl/src/com/intellij/diff/util/DiffTaskQueue.java b/platform/diff-impl/src/com/intellij/diff/util/DiffTaskQueue.java
index 40b6b6733967..4c4283136d29 100644
--- a/platform/diff-impl/src/com/intellij/diff/util/DiffTaskQueue.java
+++ b/platform/diff-impl/src/com/intellij/diff/util/DiffTaskQueue.java
@@ -15,64 +15,19 @@
  */
 package com.intellij.diff.util;
 
-import com.intellij.openapi.Disposable;
 import com.intellij.openapi.progress.ProgressIndicator;
-import com.intellij.openapi.util.Disposer;
-import com.intellij.util.Alarm;
 import com.intellij.util.Function;
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.CalledInAwt;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
-import java.util.concurrent.atomic.AtomicReference;
-
-public class DiffTaskQueue implements Disposable {
-  @NotNull private final Object LOCK = new Object();
-  @NotNull private final Alarm myAlarm = new Alarm();
-
-  private boolean myDisposed;
-  @NotNull private final AtomicReference<ProgressIndicator> myProgressIndicator = new AtomicReference<ProgressIndicator>();
-
-  @CalledInAny
-  public void dispose() {
-    // if EDT is awaiting for background progress in executeAndTryWait - it holds LOCK.
-    // so we want to try cancel indicator before getting the lock.
-    cancelProgress();
-    synchronized (LOCK) {
-      if (myDisposed) return;
-      myDisposed = true;
-      cancelProgress();
-      Disposer.dispose(myAlarm);
-    }
-  }
+public class DiffTaskQueue {
+  @Nullable private ProgressIndicator myProgressIndicator;
 
   @CalledInAwt
   public void abort() {
-    synchronized (LOCK) {
-      cancelProgress();
-      myAlarm.cancelAllRequests();
-    }
-  }
-
-  private void cancelProgress() {
-    ProgressIndicator indicator = myProgressIndicator.getAndSet(null);
-    if (indicator != null) indicator.cancel();
-  }
-
-  @CalledInAwt
-  public void abortAndSchedule(@NotNull final Runnable task, int millis) {
-    synchronized (LOCK) {
-      if (myDisposed) return;
-      abort();
-
-      myAlarm.addRequest(new Runnable() {
-        @Override
-        public void run() {
-          synchronized (LOCK) {
-            if (myDisposed) return;
-          }
-          task.run();
-        }
-      }, millis);
-    }
+    if (myProgressIndicator != null) myProgressIndicator.cancel();
+    myProgressIndicator = null;
   }
 
   @CalledInAwt
@@ -87,11 +42,7 @@ public class DiffTaskQueue implements Disposable {
                                 @Nullable final Runnable onSlowAction,
                                 final int waitMillis,
                                 final boolean forceEDT) {
-    synchronized (LOCK) {
-      if (myDisposed) return;
-      abort();
-
-      myProgressIndicator.set(BackgroundTaskUtil.executeAndTryWait(backgroundTask, onSlowAction, waitMillis, forceEDT));
-    }
+    abort();
+    myProgressIndicator = BackgroundTaskUtil.executeAndTryWait(backgroundTask, onSlowAction, waitMillis, forceEDT);
   }
 }
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/CacheChangeProcessor.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/CacheChangeProcessor.java
index fd0b781bd06a..20ef03570cae 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/CacheChangeProcessor.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/CacheChangeProcessor.java
@@ -31,7 +31,6 @@ import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.util.ProgressWindow;
 import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.vcs.changes.actions.diff.ChangeDiffRequestProducer;
 import com.intellij.util.Function;
@@ -161,7 +160,7 @@ public abstract class CacheChangeProcessor extends DiffRequestProcessor {
   @CalledInAwt
   protected void onDispose() {
     super.onDispose();
-    Disposer.dispose(myQueue);
+    myQueue.abort();
     myRequestCache.clear();
   }