diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinDslGradleKotlinFrameworkSupportProvider.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinDslGradleKotlinFrameworkSupportProvider.kt
index a29936d1cab..b2538f25e6e 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinDslGradleKotlinFrameworkSupportProvider.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinDslGradleKotlinFrameworkSupportProvider.kt
@@ -112,13 +112,6 @@ abstract class KotlinDslGradleKotlinFrameworkSupportProvider(
 
     protected abstract fun getOldSyntaxPluginDefinition(): String
     protected abstract fun getPluginDefinition(): String
-
-    protected fun composeDependency(buildScriptData: BuildScriptDataBuilder, artifactId: String): String {
-        return if (buildScriptData.gradleVersion >= MIN_GRADLE_VERSION_FOR_NEW_PLUGIN_SYNTAX)
-            "implementation(${getKotlinModuleDependencySnippet(artifactId, null)})"
-        else
-            "implementation(${getKotlinModuleDependencySnippet(artifactId, "\$$GSK_KOTLIN_VERSION_PROPERTY_NAME")})"
-    }
 }
 
 class KotlinDslGradleKotlinJavaFrameworkSupportProvider :
@@ -127,6 +120,9 @@ class KotlinDslGradleKotlinJavaFrameworkSupportProvider :
     override fun getOldSyntaxPluginDefinition() = "plugin(\"${KotlinGradleModuleConfigurator.KOTLIN}\")"
     override fun getPluginDefinition() = "kotlin(\"jvm\")"
 
+    private fun getRuntimeLibrary(rootModel: ModifiableRootModel, version: String?) =
+        "implementation(${getKotlinModuleDependencySnippet(getStdlibArtifactId(rootModel.sdk, bundledRuntimeVersion()), version)})"
+
     override fun addSupport(
         projectId: ProjectId,
         module: Module,
@@ -142,8 +138,10 @@ class KotlinDslGradleKotlinJavaFrameworkSupportProvider :
                 .addOther("tasks.withType<KotlinCompile> {\n    kotlinOptions.jvmTarget = \"1.8\"\n}\n")
         }
 
-        val artifactId = getStdlibArtifactId(rootModel.sdk, bundledRuntimeVersion())
-        buildScriptData.addDependencyNotation(composeDependency(buildScriptData, artifactId))
+        if (buildScriptData.gradleVersion >= MIN_GRADLE_VERSION_FOR_NEW_PLUGIN_SYNTAX)
+            buildScriptData.addDependencyNotation(getRuntimeLibrary(rootModel, null))
+        else
+            buildScriptData.addDependencyNotation(getRuntimeLibrary(rootModel, "\$$GSK_KOTLIN_VERSION_PROPERTY_NAME"))
     }
 }
 
@@ -163,13 +161,18 @@ abstract class AbstractKotlinDslGradleKotlinJSFrameworkSupportProvider(
         super.addSupport(projectId, module, rootModel, modifiableModelsProvider, buildScriptData)
 
         buildScriptData.addOther("kotlin.target.$jsSubTargetName { }")
-        val artifactId = MAVEN_JS_STDLIB_ID.removePrefix("kotlin-")
-        buildScriptData.addDependencyNotation(composeDependency(buildScriptData, artifactId))
+
+        if (buildScriptData.gradleVersion >= MIN_GRADLE_VERSION_FOR_NEW_PLUGIN_SYNTAX)
+            buildScriptData.addDependencyNotation(getRuntimeLibrary(rootModel, null))
+        else
+            buildScriptData.addDependencyNotation(getRuntimeLibrary(rootModel, "\$$GSK_KOTLIN_VERSION_PROPERTY_NAME"))
     }
 
     override fun getOldSyntaxPluginDefinition(): String = "plugin(\"${KotlinJsGradleModuleConfigurator.KOTLIN_JS}\")"
     override fun getPluginDefinition(): String = "id(\"org.jetbrains.kotlin.js\")"
 
+    private fun getRuntimeLibrary(rootModel: ModifiableRootModel, version: String?) =
+        "implementation(${getKotlinModuleDependencySnippet(MAVEN_JS_STDLIB_ID.removePrefix("kotlin-"), version)})"
 }
 
 class KotlinDslGradleKotlinJSBrowserFrameworkSupportProvider :