diff --git a/platform/core-impl/src/com/intellij/openapi/progress/impl/ProgressRunner.java b/platform/core-impl/src/com/intellij/openapi/progress/impl/ProgressRunner.java
index 3567f1c1971a..4c50fb87fdeb 100644
--- a/platform/core-impl/src/com/intellij/openapi/progress/impl/ProgressRunner.java
+++ b/platform/core-impl/src/com/intellij/openapi/progress/impl/ProgressRunner.java
@@ -243,11 +243,13 @@ public final class ProgressRunner<R> {
         resultFuture.completeExceptionally(t);
       }
     }
-    else if (ApplicationManager.getApplication().isDispatchThread()) {
-      resultFuture = execFromEDT(progressFuture, modalityEntered, onThreadCallable);
-    }
     else {
-      resultFuture = normalExec(progressFuture, modalityEntered, onThreadCallable);
+      if (ApplicationManager.getApplication().isDispatchThread()) {
+        resultFuture = execFromEDT(progressFuture, modalityEntered, onThreadCallable);
+      }
+      else {
+        resultFuture = normalExec(progressFuture, modalityEntered, onThreadCallable);
+      }
     }
 
     return resultFuture.handle((result, e) -> {