diff --git a/bin/themis b/bin/themis
index 52a2792..ed26c7e 100755
--- a/bin/themis
+++ b/bin/themis
@@ -22,4 +22,4 @@ if [ ! -f "${STARTUP_SCRIPT}" ]; then
 	exit 2
 fi

-"${THEMIS_VIM}" -u NONE -i NONE -n -N ${THEMIS_ARGS} --cmd "source ${STARTUP_SCRIPT}" -- "$@" 3>&1 1>&2 2>&3 3>&-
+"${THEMIS_VIM}" -u NONE -i NONE -n -N ${THEMIS_ARGS} --cmd "let g:themis#args = '$*'" --cmd "source ${STARTUP_SCRIPT}" -- 3>&1 1>&2 2>&3 3>&-
diff --git a/macros/themis_startup.vim b/macros/themis_startup.vim
index 6ed7614..c00b19f 100644
--- a/macros/themis_startup.vim
+++ b/macros/themis_startup.vim
@@ -20,17 +20,7 @@ endfunction
 function! s:start() abort
   let g:themis#cmdline = 1
   call s:append_rtp(s:themis_home)
-  let args = argv()
-  if 0 < len(args)
-    " Remove arglist for plain environment
-    execute '1,' . len(args) . 'argdelete'
-
-    " Delete all the buffers
-    for bufnr in range(1, bufnr('$'))
-      execute bufnr 'bwipeout!'
-    endfor
-  endif
-
+  let args = split(g:themis#args, ' ')
   return themis#command#start(args)
 endfunction