diff --git a/packages/language-gfm/lib/main.js b/packages/language-gfm/lib/main.js
index f85b2f4cd..1ddb58d05 100644
--- a/packages/language-gfm/lib/main.js
+++ b/packages/language-gfm/lib/main.js
@@ -23,13 +23,11 @@ exports.activate = () => {
     languageScope: null
   });
 
-  // Create one HTML injection layer for all block-level HTML nodes.
+  // A separate injection layer for each block-level HTML node.
   atom.grammars.addInjectionPoint('source.gfm', {
-    type: 'document',
+    type: 'html_block',
     language: () => 'html',
-    content(node) {
-      return node.descendantsOfType('html_block');
-    },
+    content: (node) => node,
     includeChildren: true
   });