diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/PsesSemanticTokensHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/PsesSemanticTokensHandler.cs
index e5e69e60fe..494843bb5a 100644
--- a/src/PowerShellEditorServices/Services/TextDocument/Handlers/PsesSemanticTokensHandler.cs
+++ b/src/PowerShellEditorServices/Services/TextDocument/Handlers/PsesSemanticTokensHandler.cs
@@ -108,6 +108,11 @@ private static SemanticTokenType MapSemanticTokenType(Token token)
                 return SemanticTokenType.Operator;
             }
 
+            if ((token.TokenFlags & TokenFlags.AttributeName) != 0)
+            {
+                return SemanticTokenType.Decorator;
+            }
+
             if ((token.TokenFlags & TokenFlags.TypeName) != 0)
             {
                 return SemanticTokenType.Type;
@@ -142,8 +147,8 @@ private static SemanticTokenType MapSemanticTokenType(Token token)
                 case TokenKind.Number:
                     return SemanticTokenType.Number;
 
-                case TokenKind.Generic:
-                    return SemanticTokenType.Function;
+                case TokenKind.Label:
+                    return SemanticTokenType.Label;
             }
 
             return null;