diff --git a/platform/diff-impl/src/com/intellij/diff/merge/MergeRequestProcessor.java b/platform/diff-impl/src/com/intellij/diff/merge/MergeRequestProcessor.java
index 325bbf6b1e88..f7ec57dc31ec 100644
--- a/platform/diff-impl/src/com/intellij/diff/merge/MergeRequestProcessor.java
+++ b/platform/diff-impl/src/com/intellij/diff/merge/MergeRequestProcessor.java
@@ -215,6 +215,7 @@ public abstract class MergeRequestProcessor implements Disposable {
         onDispose();
 
         destroyViewer();
+        applyRequestResult(MergeResult.CANCEL);
       }
     });
   }
@@ -269,7 +270,6 @@ public abstract class MergeRequestProcessor implements Disposable {
 
   @CalledInAwt
   protected void onDispose() {
-    applyRequestResult(MergeResult.CANCEL);
   }
 
   protected void setWindowTitle(@NotNull String title) {