diff --git a/data/syntax/kconfig.xml b/data/syntax/kconfig.xml
--- a/data/syntax/kconfig.xml
+++ b/data/syntax/kconfig.xml
@@ -68,7 +68,7 @@
 
 -->
 
-<language name="Kconfig" section="Configuration" extensions="Kconfig*" version="5" kateversion="3.4" casesensitive="true" priority="0" author="Martin Walch (walch.martin@web.de)" license="GPLv3">
+<language name="Kconfig" section="Configuration" extensions="Kconfig*" version="6" kateversion="3.4" casesensitive="true" priority="0" author="Martin Walch (walch.martin@web.de)" license="GPLv3">
 
 	<highlighting>
 		<contexts>
@@ -235,7 +235,7 @@
 				<RegExpr String="(menu|endmenu|source|choice|endchoice|comment|config|menuconfig|if|endif)(?!&n;)" attribute="property" lookAhead="true" endRegion="comment_stmt" context="#pop" />
 			</context>
 
-			<context name="config_entry_start" attribute="plain" lineEndContext="error" fallthrough="true" fallthroughContext="error">
+			<context name="config_entry_start" attribute="plain" lineEndContext="#pop!error" fallthrough="true" fallthroughContext="#pop!error">
 				<IncludeRules context="wsOrComment" />
 				<IncludeRules context="ignoreBadParamChars" />
 				<RegExpr String="&n1;+" attribute="symbolVar" context="#pop!config_option_list.nl" />
@@ -360,7 +360,7 @@
 				<DetectChar char="&quot;" attribute="symbolConst" context="#pop!ifOpt" />
 			</context>
 
-			<context name="menu_entry" attribute="plain" lineEndContext="error" fallthrough="true" fallthroughContext="error">
+			<context name="menu_entry" attribute="plain" lineEndContext="#pop!error" fallthrough="true" fallthroughContext="#pop!error">
 				<IncludeRules context="wsOrComment" />
 				<IncludeRules context="ignoreBadParamChars" />
 				<RegExpr String="&n1;+" attribute="unquotedPrompt" context="#pop!menu_visList.nl" />