diff --git a/ILSpy/Languages/CSharpHighlightingTokenWriter.cs b/ILSpy/Languages/CSharpHighlightingTokenWriter.cs
index 633ac75e6..6d91a6a11 100644
--- a/ILSpy/Languages/CSharpHighlightingTokenWriter.cs
+++ b/ILSpy/Languages/CSharpHighlightingTokenWriter.cs
@@ -127,9 +127,14 @@ namespace ICSharpCode.ILSpy
 				case "global":
 				case "dynamic":
 				case "await":
-				case "where":
 					color = structureKeywordsColor;
 					break;
+				case "where":
+					if (nodeStack.PeekOrDefault() is QueryClause)
+						color = queryKeywordsColor;
+					else
+						color = structureKeywordsColor;
+					break;
 				case "in":
 					if (nodeStack.PeekOrDefault() is ForeachStatement)
 						color = structureKeywordsColor;