diff --git a/syntax/texinfo.nanorc b/syntax/texinfo.nanorc
index 39cb20f9..33a1738e 100644
--- a/syntax/texinfo.nanorc
+++ b/syntax/texinfo.nanorc
@@ -15,7 +15,7 @@ color purple start="^@direntry" end="^@end direntry"
 color cyan "^@[a-z]+[[:space:]]+.*"
 color lightmagenta "@([a-z]+|,|H|U)\{([^}]|@\}|@[a-z]+\{[^}]*\})*\}"
 # Commands themselves.
-color yellow "@([a-z]+\{?|[,HU]\{|(AA|AE|DH|L|OE?|(La)?TeX|TH)\{)|\}"
+color yellow "^@[a-z]+([[:space:]]|$)|@([a-z]+|,|H|U|AA|AE|DH|L|OE?|(La)?TeX|TH)\{|\}"
 color pink "@[!"'&*./:=?@\^`{}~-]"
 
 # Special separator for headings and footings.