diff --git a/ICSharpCode.NRefactory.CSharp/Analysis/SemanticHighlightingVisitor.cs b/ICSharpCode.NRefactory.CSharp/Analysis/SemanticHighlightingVisitor.cs
index b760c19c2f..06e5003e7f 100644
--- a/ICSharpCode.NRefactory.CSharp/Analysis/SemanticHighlightingVisitor.cs
+++ b/ICSharpCode.NRefactory.CSharp/Analysis/SemanticHighlightingVisitor.cs
@@ -547,13 +547,14 @@ namespace ICSharpCode.NRefactory.CSharp.Analysis
 		
 		public override void VisitVariableInitializer(VariableInitializer variableInitializer)
 		{
+			var nameToken = variableInitializer.NameToken;
+			VisitChildrenUntil(variableInitializer, nameToken);
 			if (variableInitializer.Parent is FieldDeclaration) {
-				VisitChildrenUntil(variableInitializer, variableInitializer.NameToken);
-				Colorize(variableInitializer.NameToken, variableDeclarationColor);
-				VisitChildrenAfter(variableInitializer, variableInitializer.NameToken);
+				Colorize(nameToken, fieldDeclarationColor);
 			} else {
-				VisitChildren(variableInitializer);
+				Colorize(nameToken, variableDeclarationColor);
 			}
+			VisitChildrenAfter(variableInitializer, nameToken);
 		}
 		
 		public override void VisitComment(Comment comment)