diff --git a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java
index 8f25a7a79c53..d6f17b474113 100644
--- a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java
+++ b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java
@@ -472,14 +472,7 @@ public final class JavaSdkImpl extends JavaSdk {
     addDocs(jdkHomePath, sdkModificator, null);
     attachJdkAnnotations(sdkModificator);
 
-    Application application = ApplicationManager.getApplication();
-    Runnable runnable = () -> sdkModificator.commitChanges();
-    if (application.isDispatchThread()) {
-      application.runWriteAction(runnable);
-    } else {
-      application.invokeAndWait(() -> application.runWriteAction(runnable));
-    }
-
+    sdkModificator.applyChangesWithoutWriteAction();
     return jdk;
   }