diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinSourceSetDataService.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinSourceSetDataService.kt
index aa4ad7788c9..6909fa61d92 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinSourceSetDataService.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinSourceSetDataService.kt
@@ -26,7 +26,6 @@ import org.jetbrains.kotlin.gradle.KotlinModule
 import org.jetbrains.kotlin.gradle.KotlinPlatform
 import org.jetbrains.kotlin.gradle.KotlinSourceSet
 import org.jetbrains.kotlin.idea.facet.*
-import org.jetbrains.kotlin.idea.framework.KotlinSdkType
 import org.jetbrains.kotlin.idea.inspections.gradle.findAll
 import org.jetbrains.kotlin.idea.inspections.gradle.findKotlinPluginVersion
 import org.jetbrains.kotlin.idea.platform.IdePlatformKindTooling
@@ -44,7 +43,6 @@ class KotlinSourceSetDataService : AbstractProjectDataService<GradleSourceSetDat
         project: Project,
         modelsProvider: IdeModifiableModelsProvider
     ) {
-        var hasKotlinSourceRootTypes = false
         for (nodeToImport in toImport) {
             val mainModuleData = ExternalSystemApiUtil.findParent(
                 nodeToImport,
@@ -58,7 +56,6 @@ class KotlinSourceSetDataService : AbstractProjectDataService<GradleSourceSetDat
 
             if (platform != KotlinPlatform.JVM && platform != KotlinPlatform.ANDROID) {
                 migrateNonJvmSourceFolders(rootModel)
-                hasKotlinSourceRootTypes = true
             }
 
             configureFacet(sourceSetData, kotlinSourceSet, mainModuleData, ideModule, modelsProvider)?.let { facet ->
@@ -69,9 +66,6 @@ class KotlinSourceSetDataService : AbstractProjectDataService<GradleSourceSetDat
                 assignTestScope(rootModel)
             }
         }
-        if (hasKotlinSourceRootTypes) {
-            KotlinSdkType.setUpIfNeeded()
-        }
     }
 
     private fun assignTestScope(rootModel: ModifiableRootModel) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/roots/projectRootUtils.kt b/idea/src/org/jetbrains/kotlin/idea/roots/projectRootUtils.kt
index 137b3e5d2e6..cfc0f9a1874 100644
--- a/idea/src/org/jetbrains/kotlin/idea/roots/projectRootUtils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/roots/projectRootUtils.kt
@@ -22,6 +22,7 @@ import org.jetbrains.jps.model.module.JpsModuleSourceRoot
 import org.jetbrains.jps.model.module.JpsModuleSourceRootType
 import org.jetbrains.kotlin.config.KotlinResourceRootType
 import org.jetbrains.kotlin.config.KotlinSourceRootType
+import org.jetbrains.kotlin.idea.framework.KotlinSdkType
 
 private fun JpsModuleSourceRoot.getOrCreateProperties() =
     getProperties(rootType)?.also { (it as? JpsElementBase<*>)?.setParent(null) } ?: rootType.createDefaultProperties()
@@ -48,6 +49,7 @@ fun migrateNonJvmSourceFolders(modifiableRootModel: ModifiableRootModel) {
             contentEntry.addSourceFolder(url, newSourceRootType, properties)
         }
     }
+    KotlinSdkType.setUpIfNeeded()
 }
 
 fun getKotlinAwareDestinationSourceRoots(project: Project): List<VirtualFile> {