diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java
index a4302558a359..4a4c3227e360 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java
@@ -581,7 +581,12 @@ public class GradleUtil {
     };
 
     if (synchronous) {
-      UIUtil.invokeAndWaitIfNeeded(wrappedTask);
+      if (ApplicationManager.getApplication().isDispatchThread()) {
+        wrappedTask.run();
+      }
+      else {
+        UIUtil.invokeAndWaitIfNeeded(wrappedTask);
+      }
     }
     else {
       UIUtil.invokeLaterIfNeeded(wrappedTask);