diff --git a/zshrc b/zshrc
index 1fee7f1..6f69ef2 100644
--- a/zshrc
+++ b/zshrc
@@ -20,7 +20,7 @@ export PATH="$PATH:$GOPATH/bin"
 
 export MANPATH="/usr/local/opt/coreutils/libexec/gnuman:$MANPATH"
 export NODE_PATH=/usr/local/lib/node_modules
-export EDITOR=emacs
+export EDITOR=vim
 export ACK_PAGER_COLOR="less -x4SRFX"
 
 # Setup Python/Virtualenv