diff --git a/lua/custom/plugins/lsp/clangd.lua b/lua/custom/plugins/lsp/clangd.lua
index 1caa8da5..590e3b60 100644
--- a/lua/custom/plugins/lsp/clangd.lua
+++ b/lua/custom/plugins/lsp/clangd.lua
@@ -127,9 +127,9 @@ return {
   'neovim/nvim-lspconfig',
   ft = M.clang_filetypes,
   config = function()
-    vim.api.nvim_create_autocmd('BufReadPost', {
+    vim.api.nvim_create_autocmd('FileType', {
       group = vim.api.nvim_create_augroup('clangd-lazy-init', { clear = true }),
-      pattern = '*',
+      pattern = table.concat(M.clang_filetypes, ','),
       callback = function(args)
         local ft = vim.bo[args.buf].filetype
         if vim.tbl_contains(M.clang_filetypes, ft) then
@@ -141,7 +141,7 @@ return {
             M.watch_compile_commands()
           end
 
-          vim.keymap.set('n', '<leader>cc', M.pick_commands_dir, { desc = 'Pick location of compile_commands.json for clangd' })
+          vim.keymap.set('n', '<leader>cc', M.pick_commands_dir, { desc = 'Pick location of compile_commands.json for clangd', buffer = args.buf })
           vim.api.nvim_clear_autocmds { group = 'clangd-lazy-init' }
         end
       end,