diff --git a/platform/core-impl/src/com/intellij/openapi/application/impl/EdtCoroutineDispatcherFactory.kt b/platform/core-impl/src/com/intellij/openapi/application/impl/EdtCoroutineDispatcherFactory.kt
index 4ef56968d270..2dfbd24233af 100644
--- a/platform/core-impl/src/com/intellij/openapi/application/impl/EdtCoroutineDispatcherFactory.kt
+++ b/platform/core-impl/src/com/intellij/openapi/application/impl/EdtCoroutineDispatcherFactory.kt
@@ -11,6 +11,11 @@ internal class EdtCoroutineDispatcherFactory : MainDispatcherFactory {
   override val loadPriority: Int get() = 0
 
   override fun createDispatcher(allFactories: List<MainDispatcherFactory>): MainCoroutineDispatcher {
-    return EdtCoroutineDispatcher.Locking
+    return if (System.getProperty("ide.install.ui.dispatcher.as.main.coroutine.dispatcher")?.toBooleanStrictOrNull() ?: true) {
+      EdtCoroutineDispatcher.Main
+    }
+    else {
+      EdtCoroutineDispatcher.Locking
+    }
   }
 }