diff --git a/syntaxes/Code Block Syntaxes.sublime-completions b/syntaxes/Code Block Syntaxes.sublime-completions
index abec35fd..a5439ff7 100644
--- a/syntaxes/Code Block Syntaxes.sublime-completions	
+++ b/syntaxes/Code Block Syntaxes.sublime-completions	
@@ -240,6 +240,14 @@
 			"details": "Specifies <code>GraphViz</code> code highlighting"
 		},
 
+		// Groovy
+		{
+			"trigger": "groovy",
+			"annotation": "Groovy",
+			"kind": ["markup", "s", "Syntax"],
+			"details": "Specifies <code>Groovy</code> code highlighting"
+		},
+
 		// Haskell
 		{
 			"trigger": "haskell",
diff --git a/syntaxes/Markdown.sublime-syntax b/syntaxes/Markdown.sublime-syntax
index 32ea726b..db355caa 100644
--- a/syntaxes/Markdown.sublime-syntax
+++ b/syntaxes/Markdown.sublime-syntax
@@ -1439,7 +1439,9 @@ contexts:
         6: comment.line.infostring.markdown
         7: meta.fold.code-fence.begin.markdown
       embed: scope:source.groovy
-      embed_scope: markup.raw.code-fence.groovy.markdown-gfm
+      embed_scope:
+        markup.raw.code-fence.groovy.markdown-gfm
+        source.groovy
       escape: '{{fenced_code_block_escape}}'
       escape_captures:
         0: meta.code-fence.definition.end.groovy.markdown-gfm