diff --git a/config/nvim/after/ftplugin/NeogitCommitMessage.lua b/config/nvim/after/ftplugin/NeogitCommitMessage.lua
new file mode 100644
index 0000000..8548080
--- /dev/null
+++ b/config/nvim/after/ftplugin/NeogitCommitMessage.lua
@@ -0,0 +1 @@
+require("fschauen.util.options").set_gitcommit_buffer_options()
diff --git a/config/nvim/lua/fschauen/autocmd.lua b/config/nvim/lua/fschauen/autocmd.lua
index c24ef12..621521d 100644
--- a/config/nvim/lua/fschauen/autocmd.lua
+++ b/config/nvim/lua/fschauen/autocmd.lua
@@ -29,15 +29,6 @@ M.setup = function()
       vim.opt.cursorlineopt = "both"
     end,
   })
-
-  vim.api.nvim_create_autocmd("FileType", {
-    desc = "Replicate gitcommit filetype options for Neogit commit.",
-    group = group,
-    pattern = "NeogitCommitMessage",
-    callback = function(_)
-      require("fschauen.util.options").set_gitcommit_buffer_options()
-    end,
-  })
 end
 
 return M