diff --git a/grammars/javascript.cson b/grammars/javascript.cson
index 09b456cb..97ccdc68 100644
--- a/grammars/javascript.cson
+++ b/grammars/javascript.cson
@@ -997,7 +997,7 @@
   }
   {
     'match': '''(?x) (?<!\\$) \\b (?:
-      (document|event|navigator|performance|screen|window)
+      (document|event|navigator|performance|screen|window|self|frames)
       |
       (AnalyserNode|ArrayBufferView|Attr|AudioBuffer|AudioBufferSourceNode|AudioContext|AudioDestinationNode|AudioListener
       |AudioNode|AudioParam|BatteryManager|BeforeUnloadEvent|BiquadFilterNode|Blob|BufferSource|ByteString|CSS|CSSConditionRule
@@ -1112,7 +1112,7 @@
         'name': 'support.variable.property.dom.js'
   }
   {
-    'match': '(?<!\\.)\\b(module|exports|__filename|__dirname|global|process)(?!\\s*:)\\b'
+    'match': '(?<!\\.)\\b(module|exports|__filename|__dirname|global|globalThis|process)(?!\\s*:)\\b'
     'name': 'support.variable.js'
   }
   {
diff --git a/grammars/tree-sitter-javascript.cson b/grammars/tree-sitter-javascript.cson
index a061c4d3..86919162 100644
--- a/grammars/tree-sitter-javascript.cson
+++ b/grammars/tree-sitter-javascript.cson
@@ -114,11 +114,11 @@ scopes:
 
   'identifier': [
     {
-      match: '^(global|module|exports|__filename|__dirname)$',
+      match: '^(global|globalThis|module|exports|__filename|__dirname)$',
       scopes: 'support.variable'
     },
     {
-      match: '^(window|event|document|performance|screen|navigator|console)$'
+      match: '^(window|self|frames|event|document|performance|screen|navigator|console)$'
       scopes: 'support.variable.dom'
     },
     {