diff --git a/plugins/kotlin/idea/kotlin.idea.iml b/plugins/kotlin/idea/kotlin.idea.iml
index 8f32cdf6a845..530cceed6a65 100644
--- a/plugins/kotlin/idea/kotlin.idea.iml
+++ b/plugins/kotlin/idea/kotlin.idea.iml
@@ -126,5 +126,6 @@
     <orderEntry type="module" module-name="kotlin.code-insight.line-markers-shared" />
     <orderEntry type="module" module-name="intellij.platform.workspace.jps" />
     <orderEntry type="module" module-name="intellij.platform.backend.workspace" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/framework/CreateKotlinSdkActivity.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/framework/CreateKotlinSdkActivity.kt
index c25f492d16a8..9a58379f4e0a 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/framework/CreateKotlinSdkActivity.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/framework/CreateKotlinSdkActivity.kt
@@ -3,6 +3,7 @@
 package org.jetbrains.kotlin.idea.framework
 
 import com.intellij.facet.ProjectFacetManager
+import com.intellij.openapi.progress.blockingContext
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.startup.ProjectActivity
 import org.jetbrains.kotlin.idea.base.facet.platform.platform
@@ -20,10 +21,12 @@ private class CreateKotlinSdkActivity : ProjectActivity {
     override suspend fun execute(project: Project) {
         val modulesWithFacet = ProjectFacetManager.getInstance(project).getModulesWithFacet(KotlinFacetType.TYPE_ID)
         if (modulesWithFacet.isNotEmpty()) {
-            KotlinSdkType.setUpIfNeeded {
-                modulesWithFacet.any {
-                    val platform = it.platform
-                    platform.isJs() || platform.isNative() || platform.isCommon()
+            blockingContext {
+                KotlinSdkType.setUpIfNeeded {
+                    modulesWithFacet.any {
+                        val platform = it.platform
+                        platform.isJs() || platform.isNative() || platform.isCommon()
+                    }
                 }
             }
         }