diff --git a/autoload/startify.vim b/autoload/startify.vim
index 5f9b40f..5f05834 100644
--- a/autoload/startify.vim
+++ b/autoload/startify.vim
@@ -90,8 +90,7 @@ function! startify#insane_in_the_membrane() abort
     execute 'nnoremap <buffer><silent> '. g:startify_empty_buffer_key .' :enew<cr>'
   endif
 
-  autocmd! startify *
-  autocmd  startify CursorMoved <buffer> call s:set_cursor()
+  autocmd startify CursorMoved <buffer> call s:set_cursor()
 
   call cursor((s:show_special ? 4 : 2) + s:offset_header, 5)
 endfunction
@@ -354,8 +353,8 @@ endfunction
 
 " Function: s:open_buffers {{{1
 function! s:open_buffers(cword) abort
-  enew
   if exists('s:marked') && !empty(s:marked)
+    enew
     for i in range(len(s:marked))
       for val in values(s:marked)
         if val[0] == i