diff --git a/autoload/startify.vim b/autoload/startify.vim
index 54baca3..d39dcb6 100644
--- a/autoload/startify.vim
+++ b/autoload/startify.vim
@@ -11,7 +11,7 @@ let g:autoloaded_startify = 1
 
 " Init: values {{{1
 let s:nowait_string  = v:version >= 704 || (v:version == 703 && has('patch1261')) ? '<nowait>' : ''
-let s:nowait         = get(g:, 'startify_mapping_nowait') ? s:nowait_string : ''
+let s:nowait         = get(g:, 'startify_mapping_nowait', 1) ? s:nowait_string : ''
 let s:numfiles       = get(g:, 'startify_files_number', 10)
 let s:show_special   = get(g:, 'startify_enable_special', 1)
 let s:delete_buffers = get(g:, 'startify_session_delete_buffers')
diff --git a/doc/startify.txt b/doc/startify.txt
index e5d8c0a..ac1644a 100644
--- a/doc/startify.txt
+++ b/doc/startify.txt
@@ -591,16 +591,12 @@ $PWD and $OLDPWD are ignored.
 -----------------------------------------------------------------------------
                                                     *g:startify_mapping_nowait*
 >
-    let g:startify_mapping_nowait = 0
+    let g:startify_mapping_nowait = 1
 <
 Force the usage of |<nowait>| in all mappings.
 
 This helps guarding against global mappings that start with the same
-characters as a Startify index, but might break local mappings, e.g. when you
-have indexes "1" and "11", the "11" won't be accessable anymore, since "1"
-will be opened right way.
-
-Only use this when you know what you're doing.
+characters as the Startify indexes.
 
 NOTE: This option needs at least Vim 7.3.1261. It gets ignored otherwise.