diff --git a/config/nvim/after/ftplugin/lua.lua b/config/nvim/after/ftplugin/lua.lua
index 4edeb0c..7616185 100644
--- a/config/nvim/after/ftplugin/lua.lua
+++ b/config/nvim/after/ftplugin/lua.lua
@@ -16,6 +16,11 @@ local exec_current_lua_selection = function()
   loadstring(code)()
 end
 
+local lua_go_to_file = function()
+  require('fschauen.util').edit_lua_module(vim.fn.expand('<cfile>'))
+end
+
+vim.keymap.set('n', 'gf', lua_go_to_file, buffer)
 vim.keymap.set('n', '<localleader>x', exec_current_lua_line, buffer)
 vim.keymap.set('x', '<localleader>x', exec_current_lua_selection, buffer)
 vim.keymap.set('n', '<localleader><localleader>x', '<cmd>write | luafile %<cr>', buffer)
diff --git a/config/nvim/lua/fschauen/autocmd.lua b/config/nvim/lua/fschauen/autocmd.lua
index fb50270..43afd2b 100644
--- a/config/nvim/lua/fschauen/autocmd.lua
+++ b/config/nvim/lua/fschauen/autocmd.lua
@@ -23,19 +23,6 @@ M.setup = function()
     pattern = '*',
     callback = function(_) vim.opt.cursorlineopt = 'both' end
   })
-
-  local lua_go_to_file = function()
-    require('fschauen.util').edit_lua_module(vim.fn.expand('<cfile>'))
-  end
-
-  vim.api.nvim_create_autocmd('FileType', {
-    desc = 'Make `gf` work for lua modules.',
-    group = group,
-    pattern = 'lua',
-    callback = function (_)
-      vim.keymap.set('n', 'gf', lua_go_to_file, { buffer = 0 })
-    end
-  })
 end
 
 return M