diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9f9eea6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+tags
+*.swp
diff --git a/autoload/wrapwidth.vim b/autoload/wrapwidth.vim
index e63a37b..bd702f7 100644
--- a/autoload/wrapwidth.vim
+++ b/autoload/wrapwidth.vim
@@ -115,7 +115,7 @@ function! s:SetWrapwidth(on, ll) abort
 endfunction
 
 let s:vc = items(#{OptionSet: 'ac', WinResized: 'ad', TextChanged: 'bc',
-                        \InsertLeave: 'bc', WinEnter: 'bc', BufWinEnter: 'bc',
+                        \InsertLeave: 'bc', WinEnter: 'bc', BufEnter: 'bc',
                           \BufHidden: 'bc', BufUnload: 'bc', BufDelete: 'bc'})
 
 function! s:SetEvent(on) abort
@@ -227,8 +227,8 @@ function! s:CheckEvent(en, ...) abort
         let bw.wd = winwidth(wn)
       endif
     endfor
-  elseif ev == 'WinEnter' || ev == 'BufWinEnter'
-    if ev == 'BufWinEnter' | call s:SetProptype(cb, 1) | endif
+  elseif ev == 'WinEnter' || ev == 'BufEnter'
+    if ev == 'BufEnter' | call s:SetProptype(cb, 1) | endif
     let bw = getbufvar(cb, s:ww)
     if bw.wd != winwidth(cw)
       let wl += [cw]