diff --git a/.vim/vimrc b/.vim/vimrc
index 0c78781..e790a2d 100644
--- a/.vim/vimrc
+++ b/.vim/vimrc
@@ -852,13 +852,20 @@ nmap <silent> <leader>g :TestVisit<CR>
 " partially superseded by jasonccox/vim-wayland-clipboard (for "+)
 " still keeping the "* mappings
 " it however breaks <c-r>
-augroup wlclfixes
-  autocmd!
-  autocmd BufEnter * nunmap <C-R>+
-  autocmd BufEnter * nunmap <C-R><c-O>+
-  autocmd BufEnter * nunmap <C-R><C-P>+
-  autocmd BufEnter * nunmap <C-R><C-R>+
-augroup END
+if v:vim_did_enter
+  nunmap <C-R>+
+  nunmap <C-R><c-O>+
+  nunmap <C-R><C-P>+
+  nunmap <C-R><C-R>+
+else
+  augroup wlclfixes
+    autocmd!
+    autocmd VimEnter * nunmap <C-R>+
+    autocmd VimEnter * nunmap <C-R><c-O>+
+    autocmd VimEnter * nunmap <C-R><C-P>+
+    autocmd VimEnter * nunmap <C-R><C-R>+
+  augroup END
+endif
 
 " ------ wayland copy and pasting
 let s:env = toupper(substitute(system('uname'), '\n', '', ''))