diff --git a/plugins/devkit/devkit-core/src/projectRoots/IdeaJdk.java b/plugins/devkit/devkit-core/src/projectRoots/IdeaJdk.java
index 0e5afdd616b9..e6ab6aedf7f8 100644
--- a/plugins/devkit/devkit-core/src/projectRoots/IdeaJdk.java
+++ b/plugins/devkit/devkit-core/src/projectRoots/IdeaJdk.java
@@ -259,7 +259,9 @@ public final class IdeaJdk extends JavaDependentSdkType implements JavaSdkType {
       }
     }
 
-    ApplicationManager.getApplication().runWriteAction(() -> sdkModificator.commitChanges());
+    ApplicationManager.getApplication().invokeAndWait(() -> {
+      ApplicationManager.getApplication().runWriteAction(() -> sdkModificator.commitChanges());
+    });
     return result;
   }