diff --git a/platform/core-api/src/com/intellij/util/concurrency/EdtExecutorServiceImpl.java b/platform/core-api/src/com/intellij/util/concurrency/EdtExecutorServiceImpl.java
index e48898d41f14..9a40affdfbf8 100644
--- a/platform/core-api/src/com/intellij/util/concurrency/EdtExecutorServiceImpl.java
+++ b/platform/core-api/src/com/intellij/util/concurrency/EdtExecutorServiceImpl.java
@@ -20,7 +20,13 @@ class EdtExecutorServiceImpl extends EdtExecutorService {
 
   @Override
   public void execute(@NotNull Runnable command) {
-    execute(command, ModalityState.any());
+    Application application = ApplicationManager.getApplication();
+    if (application == null) {
+      SwingUtilities.invokeLater(command);
+    }
+    else {
+      execute(command, application.getAnyModalityState());
+    }
   }
 
   @Override