diff --git a/utils/highlightjs/highlightjs_carbon_lang.js b/utils/highlightjs/highlightjs_carbon_lang.js
index 2c1b355bb031..3e15719f551b 100644
--- a/utils/highlightjs/highlightjs_carbon_lang.js
+++ b/utils/highlightjs/highlightjs_carbon_lang.js
@@ -71,6 +71,7 @@ export default function (hljs) {
       'returned',
       'then',
       'type',
+      'typeof',
       '_',
       'unused',
       'var',
diff --git a/utils/textmate/Samples/keywords.carbon b/utils/textmate/Samples/keywords.carbon
index ec8d30452388..40c04d5c9663 100644
--- a/utils/textmate/Samples/keywords.carbon
+++ b/utils/textmate/Samples/keywords.carbon
@@ -6,7 +6,7 @@
 
 >>= <=> <<= ->? &= ^= := :? == => != >= >> <= <> << <- -= -> -- %= |= += ++ /=
 *= ~= & @ ^ : = ! > < - % . | + ? / * ~ \
-and as impls in like not or where
+and as impls in like not or typeof where
 
 // --- special-keywords
 
diff --git a/utils/textmate/Samples/keywords.svg b/utils/textmate/Samples/keywords.svg
index 316139a8574e..16af23e8af4b 100644
--- a/utils/textmate/Samples/keywords.svg
+++ b/utils/textmate/Samples/keywords.svg
@@ -9,7 +9,7 @@
 <text style="white-space:pre" x="12" y="121"><tspan fill="#6e7681"> 6 </tspan></text>
 <text style="white-space:pre" x="12" y="140"><tspan fill="#6e7681"> 7 </tspan><tspan fill="#d4d4d4">&gt;&gt;= &lt;=&gt; &lt;&lt;= -&gt;? &amp;= ^= := :? == =&gt; != &gt;= &gt;&gt; &lt;= &lt;&gt; &lt;&lt; &lt;- -= -&gt; -- %= |= += ++ /=</tspan></text>
 <text style="white-space:pre" x="12" y="159"><tspan fill="#6e7681"> 8 </tspan><tspan fill="#d4d4d4">*= ~= &amp; @ ^ : = ! &gt; &lt; - % . | + ? / * ~ \</tspan></text>
-<text style="white-space:pre" x="12" y="178"><tspan fill="#6e7681"> 9 </tspan><tspan fill="#c586c0">and</tspan><tspan fill="#d4d4d4"> </tspan><tspan fill="#c586c0">as</tspan><tspan fill="#d4d4d4"> </tspan><tspan fill="#c586c0">impls</tspan><tspan fill="#d4d4d4"> </tspan><tspan fill="#c586c0">in</tspan><tspan fill="#d4d4d4"> </tspan><tspan fill="#c586c0">like</tspan><tspan fill="#d4d4d4"> </tspan><tspan fill="#c586c0">not</tspan><tspan fill="#d4d4d4"> </tspan><tspan fill="#c586c0">or</tspan><tspan fill="#d4d4d4"> </tspan><tspan fill="#c586c0">where</tspan></text>
+<text style="white-space:pre" x="12" y="178"><tspan fill="#6e7681"> 9 </tspan><tspan fill="#c586c0">and</tspan><tspan fill="#d4d4d4"> </tspan><tspan fill="#c586c0">as</tspan><tspan fill="#d4d4d4"> </tspan><tspan fill="#c586c0">impls</tspan><tspan fill="#d4d4d4"> </tspan><tspan fill="#c586c0">in</tspan><tspan fill="#d4d4d4"> </tspan><tspan fill="#c586c0">like</tspan><tspan fill="#d4d4d4"> </tspan><tspan fill="#c586c0">not</tspan><tspan fill="#d4d4d4"> </tspan><tspan fill="#c586c0">or</tspan><tspan fill="#d4d4d4"> </tspan><tspan fill="#c586c0">typeof</tspan><tspan fill="#d4d4d4"> </tspan><tspan fill="#c586c0">where</tspan></text>
 <text style="white-space:pre" x="12" y="197"><tspan fill="#6e7681">10 </tspan></text>
 <text style="white-space:pre" x="12" y="216"><tspan fill="#6e7681">11 </tspan><tspan fill="#6a9955">// --- special-keywords</tspan></text>
 <text style="white-space:pre" x="12" y="235"><tspan fill="#6e7681">12 </tspan></text>
diff --git a/utils/textmate/Syntaxes/carbon.tmLanguage b/utils/textmate/Syntaxes/carbon.tmLanguage
index d0142432ffc0..41b21a5ccdf5 100644
--- a/utils/textmate/Syntaxes/carbon.tmLanguage
+++ b/utils/textmate/Syntaxes/carbon.tmLanguage
@@ -463,7 +463,7 @@ THIS FILE IS AUTOGENERATED FROM carbon.tmLanguage.json. DO NOT EDIT.
 				</dict>
 				<dict>
 					<key>match</key>
-					<string>\b(and|as|impls|in|like|not|or|where)\b</string>
+					<string>\b(and|as|impls|in|like|not|or|typeof|where)\b</string>
 					<key>name</key>
 					<string>keyword.control.carbon</string>
 				</dict>
diff --git a/utils/tree_sitter/queries/highlights.scm b/utils/tree_sitter/queries/highlights.scm
index 8be9a4a10fd1..f04d17202b19 100644
--- a/utils/tree_sitter/queries/highlights.scm
+++ b/utils/tree_sitter/queries/highlights.scm
@@ -130,6 +130,7 @@
   "template"
   "then"
   "type"
+  ; "typeof"
   "var"
   "virtual"
   "where"
diff --git a/utils/vim/syntax/carbon.vim b/utils/vim/syntax/carbon.vim
index 9df41690b2cc..99e80436f664 100644
--- a/utils/vim/syntax/carbon.vim
+++ b/utils/vim/syntax/carbon.vim
@@ -56,6 +56,7 @@ syn keyword carbonKeywordSelf Self
 syn keyword carbonKeywordAs as
 syn keyword carbonKeywordTemplate template
 syn keyword carbonKeywordStatic static
+syn keyword carbonKeywordTypeOf typeof
 syn keyword carbonKeywordExternal external
 syn keyword carbonKeywordForAll forall
 syn keyword carbonKeywordAPI api
@@ -99,6 +100,7 @@ hi def link carbonKeywordSelf carbonKeyword
 hi def link carbonKeywordAs carbonKeyword
 hi def link carbonKeywordTemplate carbonKeyword
 hi def link carbonKeywordStatic carbonKeyword
+hi def link carbonKeywordTypeOf carbonKeyword
 hi def link carbonKeywordExternal carbonKeyword
 hi def link carbonKeywordForAll carbonKeyword
 hi def link carbonKeywordAPI Structure
diff --git a/utils/vscode/carbon.tmLanguage.json b/utils/vscode/carbon.tmLanguage.json
index f9cd17f047fd..34344a1a7687 100644
--- a/utils/vscode/carbon.tmLanguage.json
+++ b/utils/vscode/carbon.tmLanguage.json
@@ -343,7 +343,7 @@
         },
         {
           "name": "keyword.control.carbon",
-          "match": "\\b(and|as|impls|in|like|not|or|where)\\b"
+          "match": "\\b(and|as|impls|in|like|not|or|typeof|where)\\b"
         },
         {
           "name": "keyword.other.carbon",