diff --git a/crates/languages/src/gitcommit/config.toml b/crates/languages/src/gitcommit/config.toml
index c8ffca31056acb0d7245ae42739c521879df2030..ae4b836ed66dc7558cf7b033e555dd2dba3b309c 100644
--- a/crates/languages/src/gitcommit/config.toml
+++ b/crates/languages/src/gitcommit/config.toml
@@ -1,5 +1,5 @@
 name = "Git Commit"
-grammar = "git_commit"
+grammar = "gitcommit"
 path_suffixes = [
   "TAG_EDITMSG",
   "MERGE_MSG",
diff --git a/crates/languages/src/gitcommit/highlights.scm b/crates/languages/src/gitcommit/highlights.scm
index 319d76569e56f101c7efb33b5ae676db7d51e0ab..8670a6615aa49b8062a1ef2375884bf298b1df76 100644
--- a/crates/languages/src/gitcommit/highlights.scm
+++ b/crates/languages/src/gitcommit/highlights.scm
@@ -4,6 +4,7 @@
 (commit) @constant
 (item) @markup.link.url
 (header) @tag
+(comment) @comment
 
 (change kind: "new file" @diff.plus)
 (change kind: "deleted" @diff.minus)
@@ -15,4 +16,3 @@
   value: (trailer_value) @string)
 
 [":" "=" "->" (scissors)] @punctuation.delimiter
-(comment) @comment
diff --git a/crates/languages/src/lib.rs b/crates/languages/src/lib.rs
index 5504650fc033bb027f52ecce6fe3987def13def2..29afa3f0a9706066ab5079b371a94ecc76198f04 100644
--- a/crates/languages/src/lib.rs
+++ b/crates/languages/src/lib.rs
@@ -202,6 +202,10 @@ pub fn init(languages: Arc<LanguageRegistry>, node: NodeRuntime, cx: &mut App) {
             adapters: vec![yaml_lsp_adapter],
             ..Default::default()
         },
+        LanguageInfo {
+            name: "gitcommit",
+            ..Default::default()
+        },
     ];
 
     for registration in built_in_languages {
diff --git a/crates/panel/src/panel.rs b/crates/panel/src/panel.rs
index b1c55777c7e0f114c76f693deb9da109550c058b..9859bf6444ff8558031bee0547b8948c0edba0f4 100644
--- a/crates/panel/src/panel.rs
+++ b/crates/panel/src/panel.rs
@@ -113,6 +113,7 @@ pub fn panel_editor_style(monospace: bool, window: &Window, cx: &App) -> EditorS
             line_height: line_height.into(),
             ..Default::default()
         },
+        syntax: cx.theme().syntax().clone(),
         ..Default::default()
     }
 }