diff --git a/vim/ftplugin/markdown.vim b/vim/ftplugin/markdown.vim
new file mode 100644
index 0000000000000000000000000000000000000000..5102f2e8b3cc538497a2543c2df1f3d1a76549e0
--- /dev/null
+++ b/vim/ftplugin/markdown.vim
@@ -0,0 +1,4 @@
+setlocal wrap
+
+" Set a custom commentstring for the modeline
+let b:ml_commentstring = '[_modeline]: # (%s )'
diff --git a/vimrc b/vimrc
index f27de58b35a7ac11526deb0d7988fc2b09587402..700442ec04079e12f0ae1e2b04f87de7af974620 100644
--- a/vimrc
+++ b/vimrc
@@ -106,7 +106,6 @@ autocmd FileType gitconfig setlocal commentstring=;%s
 autocmd FileType go setlocal commentstring=//%s
 autocmd FileType html setlocal commentstring=<!--%s-->
 autocmd FileType less setlocal commentstring=/*%s*/
-autocmd FileType markdown setlocal wrap commentstring=[_modeline]:\ #\ (%s\ )
 autocmd FileType php setlocal commentstring=//%s
 autocmd FileType plsql setlocal commentstring=--%s
 autocmd FileType sass setlocal commentstring=//%s