diff --git a/dotfiles/nvim.vim b/dotfiles/nvim.vim
index fb3e32a..b432e1b 100644
--- a/dotfiles/nvim.vim
+++ b/dotfiles/nvim.vim
@@ -355,9 +355,9 @@ call plug#end()
 
     " Custom surrounds, should work fine on all layouts
     "              d
-    autocmd VimEnter * let b:surround_100 = "{{@@ '{{@@ \\r @@}}' @@}}"
+    autocmd BufRead * let b:surround_100 = "{{@@ '{{@@ \\r @@}}' @@}}"
     "              s
-    autocmd VimEnter * let b:surround_115 = "{{@@ '#{%@@ \\r @@%}#\\n#{%@@  @@%}#' @@}}"
+    autocmd BufRead * let b:surround_115 = "{{@@ '#{%@@ \\r @@%}#\\n#{%@@  @@%}#' @@}}"
 
 "}}}
 " Lanugage Server{{{