diff --git a/.vim/vimrc b/.vim/vimrc
index b0f46b1..c8cbd9b 100644
--- a/.vim/vimrc
+++ b/.vim/vimrc
@@ -1211,6 +1211,17 @@ set nogdefault
 " can select past EOL in visual block if one line is longer
 set virtualedit=block
 
+" set timeoutlen=1200 "more time for typing complex mappings
+set timeoutlen=200
+
+" turn off timeout; default is 1000
+" fix airline mode changes without screwing up remaps of default letter keys
+" (without this, using escape to exit insert mode won't change airline to
+" display normal mode immediately in the terminal)
+" ttimeout only applies to keycodes (so changes to default vim keys that can't
+" be unmapped is not an issue, e.g. using r in multikey/prefix bindings)
+set notimeout ttimeout ttimeoutlen=10
+
 " persistent undo history (even if close buffer)
 " Save undos after file closes
 set undofile