diff --git a/zshrc b/zshrc
index 6f62f16..3264785 100644
--- a/zshrc
+++ b/zshrc
@@ -61,12 +61,21 @@ function configure_zle #{{{
     [[ -z "$ZLE_MODE" ]] && ZLE_MODE='vim'
     if [[ $ZLE_MODE == 'vim' ]]; then
         bindkey -v
+        configure_zle_vim
     elif [[ $ZLE_MODE == 'emacs' ]]; then
         bindkey -e
+        configure_zle_emacs
     fi
 
     # Allow deleting over the start of insert mode
     zle -A .backward-delete-char vi-backward-delete-char
+} #}}}
+
+
+function configure_zle_vim #{{{
+{
+    # Remove the delay when pressing escape to get to Insert mode.
+    bindkey -rpM viins '\e'
 
     # Edit commands in $EDITOR on 'v' in command mode
     autoload -Uz edit-command-line
@@ -75,6 +84,12 @@ function configure_zle #{{{
 } #}}}
 
 
+function configure_zle_emacs #{{{
+{
+
+} #}}}
+
+
 function configure_modules_and_functions #{{{
 {
     local myfpath="$HOME/.zsh/func"