diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationManagerImpl.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationManagerImpl.kt
index 4d2114cffc6..ef14c0d63ae 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationManagerImpl.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationManagerImpl.kt
@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.idea.core.util.EDT
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition
 import org.jetbrains.kotlin.scripting.definitions.findScriptDefinition
+import org.jetbrains.kotlin.scripting.definitions.isNonScript
 import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationResult
 import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationWrapper
 import org.jetbrains.kotlin.scripting.resolve.ScriptReportSink
@@ -320,7 +321,8 @@ class ScriptConfigurationManagerImpl internal constructor(private val project: P
     }
 
     private fun clearAndRehighlight() {
-        updateHighlighting(memoryCache.clearConfigurationCaches())
+        val openedScripts = FileEditorManager.getInstance(project).openFiles.filterNot { it.isNonScript() }
+        updateHighlighting(openedScripts)
     }
 
     private fun scriptDependenciesClassFilesScope(file: VirtualFile): GlobalSearchScope {