diff --git a/PowerEditor/installer/APIs/cs.xml b/PowerEditor/installer/APIs/cs.xml
index e2a941041..bc00419fa 100644
--- a/PowerEditor/installer/APIs/cs.xml
+++ b/PowerEditor/installer/APIs/cs.xml
@@ -1016,6 +1016,7 @@
 		<KeyWord name="virtual" />
 		<KeyWord name="void" />
 		<KeyWord name="volatile" />
+		<KeyWord name="when" />
 		<KeyWord name="while" />
 	</AutoComplete>
 </NotepadPlus>
diff --git a/PowerEditor/src/langs.model.xml b/PowerEditor/src/langs.model.xml
index 9bedf495a..aeaeee29f 100644
--- a/PowerEditor/src/langs.model.xml
+++ b/PowerEditor/src/langs.model.xml
@@ -114,7 +114,7 @@
             <Keywords name="type2">a addindex addtogroup anchor arg attention author authors b brief bug c callergraph callgraph category cite class code cond copybrief copydetails copydoc copyright date def defgroup deprecated details diafile dir docbookonly dontinclude dot dotfile e else elseif em endcode endcond enddocbookonly enddot endhtmlonly endif endinternal endlatexonly endlink endmanonly endmsc endparblock endrtfonly endsecreflist enduml endverbatim endxmlonly enum example exception extends f$ f[ f] file fn f{ f} headerfile hidecallergraph hidecallgraph hideinitializer htmlinclude htmlonly idlexcept if ifnot image implements include includelineno ingroup interface internal invariant latexinclude latexonly li line link mainpage manonly memberof msc mscfile n name namespace nosubgrouping note overload p package page par paragraph param parblock post pre private privatesection property protected protectedsection protocol public publicsection pure ref refitem related relatedalso relates relatesalso remark remarks result return returns retval rtfonly sa secreflist section see short showinitializer since skip skipline snippet startuml struct subpage subsection subsubsection tableofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version vhdlflow warning weakgroup xmlonly xrefitem</Keywords>
         </Language>
         <Language name="cs" ext="cs" commentLine="//" commentStart="/*" commentEnd="*/">
-            <Keywords name="instre1">abstract add alias as ascending async await base break case catch checked continue default delegate descending do dynamic else event explicit extern false finally fixed for foreach from get global goto group if implicit in interface internal into is join let lock namespace new null object operator orderby out override params partial private protected public readonly ref remove return sealed select set sizeof stackalloc switch this throw true try typeof unchecked unsafe using value virtual where while yield</Keywords>
+            <Keywords name="instre1">abstract add alias as ascending async await base break case catch checked continue default delegate descending do dynamic else event explicit extern false finally fixed for foreach from get global goto group if implicit in interface internal into is join let lock namespace new null object operator orderby out override params partial private protected public readonly ref remove return sealed select set sizeof stackalloc switch this throw true try typeof unchecked unsafe using value virtual when where while yield</Keywords>
             <Keywords name="type1">bool byte char class const decimal double enum float int long sbyte short static string struct uint ulong ushort var void</Keywords>
         </Language>
         <Language name="css" ext="css" commentStart="/*" commentEnd="*/">