diff --git a/cfg/01-timeouts.vim b/cfg/01-timeouts.vim
new file mode 100644
index 0000000..7ccbb97
--- /dev/null
+++ b/cfg/01-timeouts.vim
@@ -0,0 +1,6 @@
+" Timeout settings for key sequences
+
+set notimeout
+set timeoutlen=0
+set ttimeout
+set ttimeoutlen=-1
diff --git a/cfg/02-ui-options.vim b/cfg/02-ui-options.vim
index b57ef97..1d9fe7d 100644
--- a/cfg/02-ui-options.vim
+++ b/cfg/02-ui-options.vim
@@ -4,5 +4,3 @@ set showmatch			" Show matching parentheses
 set incsearch			" Incremental search
 set title			" Update terminal title
 set wildmenu			" Enhanced command completion, with menu!
-
-set timeoutlen=500		" Timeout for key sequences