diff --git a/after/ftplugin/cmake.vim b/after/ftplugin/cmake.vim
index 25c8833..67ef971 100644
--- a/after/ftplugin/cmake.vim
+++ b/after/ftplugin/cmake.vim
@@ -17,4 +17,4 @@ setlocal commentstring=#%s
 
 " Custon surround for creating a CMake variable from a text object.
 " "ys{motion}v" makes a variable out of "<text-obj>" - > "${<text-obj>}"
-autocmd FileType cmake let b:surround_{char2nr("v")} = "${\r}"
+let b:surround_{char2nr("v")} = "${\r}"
diff --git a/after/ftplugin/markdown.vim b/after/ftplugin/markdown.vim
index a0d5f3c..1c2bf6e 100644
--- a/after/ftplugin/markdown.vim
+++ b/after/ftplugin/markdown.vim
@@ -10,9 +10,9 @@ setlocal tabstop=4 shiftwidth=4 softtabstop=4
 
 " Custom surround for markdown link syntax.
 " "ys{motion}l" makes link out of "word" -> "[word]()"
-autocmd FileType markdown let b:surround_{char2nr("l")} = "[\r]()"
+let b:surround_{char2nr("l")} = "[\r]()"
 " "ys{motion}L" makes link out of "url" -> "[](url)"
-autocmd FileType markdown let b:surround_{char2nr("L")} = "[](\r)"
+let b:surround_{char2nr("L")} = "[](\r)"
 
 finish " Experiment functionality (disabled). {{{