diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/CreateKotlinSdkActivity.kt b/idea/src/org/jetbrains/kotlin/idea/framework/CreateKotlinSdkActivity.kt
index ef761ccb6e4..046cdc3e1c5 100644
--- a/idea/src/org/jetbrains/kotlin/idea/framework/CreateKotlinSdkActivity.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/framework/CreateKotlinSdkActivity.kt
@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.idea.framework
 
+import com.intellij.openapi.project.DumbAware
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.startup.StartupActivity
 import org.jetbrains.kotlin.idea.project.platform
@@ -13,11 +14,11 @@ import org.jetbrains.kotlin.platform.impl.CommonIdePlatformKind
 import org.jetbrains.kotlin.platform.impl.JsIdePlatformKind
 
 /**
- * This StartupActivity creates KotlinSdk for projects containing JS or Common modules.
+ * This StartupActivity creates KotlinSdk for projects containing non-jvm modules.
  * This activity is work-around required until the issue IDEA-203655 is fixed. The major case is to create
  * Kotlin SDK when the KotlinSourceRootType is created
  */
-class CreateKotlinSdkActivity : StartupActivity {
+class CreateKotlinSdkActivity : StartupActivity, DumbAware {
 
     override fun runActivity(project: Project) {
         val kotlinSdkIsRequired = project.allModules().any {