diff --git a/zsh/rc b/zsh/rc
index 8db1afe..3a6ec09 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -8,6 +8,7 @@ set_term_title # call it right now
 
 source $DOTFILES_ZSH_DIR/history
 source $DOTFILES_ZSH_DIR/keybindings
+source $DOTFILES_ZSH_DIR/vi
 source $DOTFILES_ZSH_DIR/completion
 source $DOTFILES_ZSH_DIR/prompt
 source $DOTFILES_ZSH_DIR/bundler
diff --git a/zsh/vi b/zsh/vi
new file mode 100644
index 0000000..38ae8ce
--- /dev/null
+++ b/zsh/vi
@@ -0,0 +1,7 @@
+#bindkey -v
+# fix esc delay
+KEYTIMEOUT=1
+# fix esc swallow
+bindkey -sM vicmd '^[' '^G'
+# fix ^X shortcuts
+bindkey -rM viins '^X'