diff --git a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java
index d51c4697c5d..3b565568926 100644
--- a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java
@@ -131,14 +131,16 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co
         this.k2jvmCompilerArguments = k2jvmCompilerArguments;
         this.isProjectSettings = isProjectSettings;
 
-        languageVersionComboBox.addActionListener(
-                new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
-                        restrictAPIVersions();
+        if (isProjectSettings) {
+            languageVersionComboBox.addActionListener(
+                    new ActionListener() {
+                        @Override
+                        public void actionPerformed(ActionEvent e) {
+                            restrictAPIVersions();
+                        }
                     }
-                }
-        );
+            );
+        }
 
         additionalArgsOptionsField.attachLabel(additionalArgsLabel);
 
@@ -298,7 +300,7 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co
     }
 
     @SuppressWarnings("unchecked")
-    private void restrictAPIVersions() {
+    public void restrictAPIVersions() {
         ApiVersion selectedAPIVersion = getSelectedAPIVersion();
         final LanguageVersion selectedLanguageVersion = getSelectedLanguageVersion();
         List<ApiVersion> permittedAPIVersions = ArraysKt.mapNotNull(
diff --git a/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt b/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt
index d706fd2a453..12a32c59a1e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt
@@ -246,7 +246,10 @@ class KotlinFacetEditorGeneralTab(
             outputDirectory.textField.validateOnChange()
             copyRuntimeFilesCheckBox.validateOnChange()
             moduleKindComboBox.validateOnChange()
-            languageVersionComboBox.validateOnChange()
+            languageVersionComboBox.addActionListener {
+                restrictAPIVersions()
+                doValidate()
+            }
             apiVersionComboBox.validateOnChange()
             coroutineSupportComboBox.validateOnChange()
         }