diff --git a/autoload/bazel.vim b/autoload/bazel.vim
index 2043fa4..4655515 100644
--- a/autoload/bazel.vim
+++ b/autoload/bazel.vim
@@ -187,8 +187,6 @@ export def DetectWorkspace()
     nnoremap <silent> gb          <Plug>(bazel-goto-build)
     nnoremap <silent> b<C-G>      <Plug>(bazel-print-rel)
     nnoremap <silent> <leader>p   <Plug>(bazel-print-label)
-    autocmd FileType bzl nnoremap <silent> <buffer> gd <Plug>(bazel-definition)
-    autocmd FileType bzl nnoremap <silent> <buffer> gr <Plug>(bazel-references)
   endif
 
   set errorformat^=%t%*[^:]:\ %f:%l:%c:\ %m # recognize error type in "<TYPE>: <file><lnum>:<col>: <message>" form
diff --git a/ftplugin/bzl.vim b/ftplugin/bzl.vim
new file mode 100644
index 0000000..4db3504
--- /dev/null
+++ b/ftplugin/bzl.vim
@@ -0,0 +1,13 @@
+vim9script
+
+if exists("b:did_ftplugin")
+  finish
+endif
+b:did_ftplugin = 1
+
+bazel#DetectWorkspace()
+
+if !exists('g:bazel_no_default_mappings') || !g:bazel_no_default_mappings
+  nnoremap <silent> <buffer> gd <Plug>(bazel-definition)
+  nnoremap <silent> <buffer> gr <Plug>(bazel-references)
+endif
diff --git a/plugin/bazel.vim b/plugin/bazel.vim
index 681b802..984f78d 100644
--- a/plugin/bazel.vim
+++ b/plugin/bazel.vim
@@ -13,6 +13,5 @@ import autoload 'bazel.vim'
 
 augroup Bazel
   autocmd!
-  autocmd FileType bzl if expand('%:t') == 'BUILD' | bazel#DetectWorkspace() | endif
-  autocmd DirChanged * bazel#DetectWorkspace()
+  autocmd VimEnter,BufEnter * bazel#DetectWorkspace()
 augroup END