diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ProjectStructureUtil.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ProjectStructureUtil.java
index e2b5257e0a1..3be8803ccd9 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ProjectStructureUtil.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ProjectStructureUtil.java
@@ -56,7 +56,7 @@ public class ProjectStructureUtil {
         return module != null && isJsKotlinModule(module);
     }
 
-    public static boolean isJavaKotlinModule(@NotNull Module module) {
+    public static boolean hasKotlinRuntimeInScope(@NotNull Module module) {
         GlobalSearchScope scope = module.getModuleWithDependenciesAndLibrariesScope(
                 hasKotlinFilesOnlyInTests(module));
         return KotlinRuntimeLibraryCoreUtil.getKotlinRuntimeMarkerClass(module.getProject(), scope) != null;
@@ -89,7 +89,7 @@ public class ProjectStructureUtil {
                     boolean hasJvmKotlinModules = false;
 
                     for (Module module : ModuleManager.getInstance(project).getModules()) {
-                        if (isJavaKotlinModule(module)) {
+                        if (hasKotlinRuntimeInScope(module)) {
                             hasJvmKotlinModules = true;
                             break;
                         }
@@ -117,7 +117,7 @@ public class ProjectStructureUtil {
                     ModuleUtilCore.collectModulesDependsOn(module, dependentModules);
 
                     for (Module module : dependentModules) {
-                        if (isJavaKotlinModule(module)) {
+                        if (hasKotlinRuntimeInScope(module)) {
                             usedInKotlinModule = true;
                             break;
                         }
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaMavenConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaMavenConfigurator.java
index 2d39e081d01..d16b189de78 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaMavenConfigurator.java
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaMavenConfigurator.java
@@ -35,7 +35,7 @@ public class KotlinJavaMavenConfigurator extends KotlinMavenConfigurator {
 
     @Override
     protected boolean isKotlinModule(@NotNull Module module) {
-        return ProjectStructureUtil.isJavaKotlinModule(module);
+        return ProjectStructureUtil.hasKotlinRuntimeInScope(module);
     }
 
     @Override
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.java
index 9e09ba74d93..cf474d37550 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.java
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.java
@@ -37,7 +37,7 @@ public class KotlinJavaModuleConfigurator extends KotlinWithLibraryConfigurator
 
     @Override
     public boolean isConfigured(@NotNull Module module) {
-        return ProjectStructureUtil.isJavaKotlinModule(module);
+        return ProjectStructureUtil.hasKotlinRuntimeInScope(module);
     }
 
     @NotNull
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinSetupEnvironmentNotificationProvider.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinSetupEnvironmentNotificationProvider.kt
index d0a1932697f..5513ccb3e15 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinSetupEnvironmentNotificationProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinSetupEnvironmentNotificationProvider.kt
@@ -39,6 +39,7 @@ import com.intellij.ui.EditorNotificationPanel
 import com.intellij.ui.EditorNotifications
 import org.jetbrains.kotlin.idea.KotlinFileType
 import org.jetbrains.kotlin.idea.KotlinLanguage
+import org.jetbrains.kotlin.idea.project.ProjectStructureUtil
 import org.jetbrains.kotlin.idea.util.application.runWriteAction
 import org.jetbrains.kotlin.idea.versions.UnsupportedAbiVersionNotificationPanelProvider
 import org.jetbrains.kotlin.idea.versions.createComponentActionLabel
@@ -77,7 +78,8 @@ class KotlinSetupEnvironmentNotificationProvider(
             return createSetupSdkPanel(myProject, psiFile)
         }
 
-        if (!isModuleConfigured(module) && UnsupportedAbiVersionNotificationPanelProvider.collectBadRoots(module).isEmpty()) {
+        if (!ProjectStructureUtil.hasKotlinRuntimeInScope(module) &&
+            UnsupportedAbiVersionNotificationPanelProvider.collectBadRoots(module).isEmpty()) {
             return createKotlinNotConfiguredPanel(module)
         }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.java
index 9cd539c9787..50e54cb0aa5 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.java
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.java
@@ -67,7 +67,7 @@ public abstract class KotlinWithGradleConfigurator implements KotlinProjectConfi
 
     @Override
     public boolean isConfigured(@NotNull Module module) {
-        if (ProjectStructureUtil.isJavaKotlinModule(module)) {
+        if (ProjectStructureUtil.hasKotlinRuntimeInScope(module)) {
             return true;
         }