diff --git a/vim/settings/path.vim b/vim/settings/path.vim
index fa23131f..18bba7a0 100644
--- a/vim/settings/path.vim
+++ b/vim/settings/path.vim
@@ -1,4 +1,11 @@
 " Set the shell to bash so we inherit its path, to make sure
 " we inherit its path. This affects :Rtags finding the right
 " path to homebrewed ctags rather than the XCode version of ctags
-set shell=bash\ -i
+"
+" Use login Shell instead of interactive shell to avoid
+" vimdiff suspended at startup
+if has("gui_running")
+  set shell=bash\ -i
+else
+  set shell=bash\ -l
+endif