diff --git a/autoload/xolox/notes.vim b/autoload/xolox/notes.vim
index e1c342d..2ed6a0a 100644
--- a/autoload/xolox/notes.vim
+++ b/autoload/xolox/notes.vim
@@ -165,7 +165,7 @@ function! xolox#notes#edit(bang, title) abort " {{{1
   endif
   " At this point we're dealing with a new note.
   let fname = xolox#notes#title_to_fname(title)
-  noautocmd execute 'edit' . a:bang fnameescape(fname)
+  execute 'edit' . a:bang fnameescape(fname)
   if line('$') == 1 && getline(1) == ''
     execute 'silent read' fnameescape(g:notes_new_note_template)
     1delete
diff --git a/plugin/notes.vim b/plugin/notes.vim
index 82d4514..ba61ad2 100644
--- a/plugin/notes.vim
+++ b/plugin/notes.vim
@@ -66,7 +66,7 @@ augroup PluginNotes
 augroup END
 
 augroup filetypedetect
-  let s:template = 'au BufNewFile,BufRead %s if &bt == "" | setl ft=notes | end'
+  let s:template = 'au BufRead %s if &bt == "" | setl ft=notes | end'
   for s:directory in xolox#notes#find_directories(0)
     execute printf(s:template, xolox#notes#autocmd_pattern(s:directory, 1))
   endfor