diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/utils.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/utils.kt
index 33ce6b3bbeb..7ea39c6532d 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/utils.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/utils.kt
@@ -8,10 +8,7 @@ package org.jetbrains.kotlin.idea.scripting.gradle
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.registry.Registry
 import com.intellij.openapi.vfs.VirtualFile
-import com.intellij.psi.PsiElement
-import com.intellij.psi.PsiManager
-import com.intellij.psi.PsiRecursiveElementVisitor
-import com.intellij.psi.PsiWhiteSpace
+import com.intellij.psi.*
 import com.intellij.psi.impl.source.tree.LeafPsiElement
 import org.gradle.util.GradleVersion
 import org.jetbrains.kotlin.idea.util.application.runReadAction
@@ -49,6 +46,7 @@ fun getGradleScriptInputsStamp(
                                 super.visitElement(element)
                                 when (element) {
                                     is PsiWhiteSpace -> if (element.text.contains("\n")) result.append("\n")
+                                    is PsiComment -> { }
                                     is LeafPsiElement -> result.append(element.text)
                                 }
                             }
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptInputsWatcherTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptInputsWatcherTest.kt
index 06d400073f3..d020f65152c 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptInputsWatcherTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptInputsWatcherTest.kt
@@ -63,6 +63,22 @@ class GradleScriptInputsWatcherTest : AbstractScriptConfigurationLoadingTest() {
         assertConfigurationUpdateWasDone(testFiles.buildKts)
     }
 
+    fun testSpacesInSectionsChange() {
+        assertAndLoadInitialConfiguration(testFiles.buildKts)
+
+        changeBuildKtsInsideSections("// INSIDE PLUGINS\n")
+
+        assertConfigurationUpToDate(testFiles.buildKts)
+    }
+
+    fun testCommentsInSectionsChange() {
+        assertAndLoadInitialConfiguration(testFiles.buildKts)
+
+        changeBuildKtsInsideSections("// My test comment\n")
+
+        assertConfigurationUpToDate(testFiles.buildKts)
+    }
+
     fun testOutsideSectionChange() {
         assertAndLoadInitialConfiguration(testFiles.buildKts)