diff --git a/vimrc b/vimrc
index fc66370cf8..d7b678980a 100644
--- a/vimrc
+++ b/vimrc
@@ -173,7 +173,9 @@ set spellfile=$HOME/.vim-spell-en.utf-8.add
 set complete+=kspell
 
 " Always use vertical diffs
-set diffopt+=vertical
+if &diff
+  set diffopt+=vertical
+endif
 
 " Local config
 if filereadable($HOME . "/.vimrc.local")