diff --git a/autoload/startify.vim b/autoload/startify.vim
index 2c4f314..ff60c05 100644
--- a/autoload/startify.vim
+++ b/autoload/startify.vim
@@ -569,11 +569,8 @@ function! s:check_user_options() abort
   let path    = expand('%')
   let session = path . s:sep .'Session.vim'
 
-  " autoload session
-  if get(g:, 'startify_session_autoload') && filereadable(session)
-    execute 'source' session
   " change to VCS root directory
-  elseif get(g:, 'startify_change_to_vcs_root')
+  if get(g:, 'startify_change_to_vcs_root')
     call s:cd_to_vcs_root(path)
   " change directory
   elseif get(g:, 'startify_change_to_dir', 1)
diff --git a/doc/startify.txt b/doc/startify.txt
index 4fa11ea..d2705f3 100644
--- a/doc/startify.txt
+++ b/doc/startify.txt
@@ -194,9 +194,9 @@ The number of files to list.
 >
     let g:startify_session_autoload = 0
 <
-If you bookmark a directory that contains a Session.vim and this option is
-enabled, that session will be loaded automatically when you open the
-directory.
+If you fire up "vim" in a directory that contains a "Session.vim", that session
+will be loaded automatically. Otherwise it will be shown as the top entry in
+the Startify buffer.
 
 Great way to create a portable project folder.
 
diff --git a/plugin/startify.vim b/plugin/startify.vim
index 3c2258d..cee8147 100644
--- a/plugin/startify.vim
+++ b/plugin/startify.vim
@@ -12,9 +12,13 @@ let g:loaded_startify = 1
 
 augroup startify
   if !get(g:, 'startify_disable_at_vimenter')
-    autocmd VimEnter *
+    autocmd VimEnter * nested
           \   if !argc() && (line2byte('$') == -1) && (v:progname =~? '^[gmnq]\=vim\=x\=\%[\.exe]$')
-          \ |   call startify#insane_in_the_membrane()
+          \ |   if get(g:, 'startify_session_autoload') && filereadable('Session.vim')
+          \ |     source Session.vim
+          \ |   else
+          \ |     call startify#insane_in_the_membrane()
+          \ |   endif
           \ | endif
           \ | autocmd! startify VimEnter
   endif