diff --git a/autoload/neosnippet/commands.vim b/autoload/neosnippet/commands.vim
index 73919a0..001f17e 100644
--- a/autoload/neosnippet/commands.vim
+++ b/autoload/neosnippet/commands.vim
@@ -68,6 +68,10 @@ function! neosnippet#commands#_edit(args) abort "{{{
     return
   endif
 
+  if !isdirectory(snippet_dir) && !neosnippet#util#is_sudo()
+    call mkdir(snippet_dir, 'p')
+  endif
+
   " Edit snippet file.
   let filename = snippet_dir .'/'.filetype
 
diff --git a/autoload/neosnippet/variables.vim b/autoload/neosnippet/variables.vim
index 0413560..6e0eb08 100644
--- a/autoload/neosnippet/variables.vim
+++ b/autoload/neosnippet/variables.vim
@@ -69,15 +69,9 @@ function! neosnippet#variables#set_snippets(list) abort "{{{
 endfunction"}}}
 function! neosnippet#variables#snippets_dir() abort "{{{
   " Set snippets_dir.
-  let snippets_dir = []
-  for dir in neosnippet#util#option2list(g:neosnippet#snippets_directory)
-    let dir = neosnippet#util#expand(dir)
-    if !isdirectory(dir) && !neosnippet#util#is_sudo()
-      call mkdir(dir, 'p')
-    endif
-    call add(snippets_dir, dir)
-  endfor
-
+  let snippets_dir = map(neosnippet#util#option2list(
+        \   g:neosnippet#snippets_directory),
+        \ 'neosnippet#util#expand(v:val)')
   return map(snippets_dir, 'substitute(v:val, "[\\\\/]$", "", "")')
 endfunction"}}}
 function! neosnippet#variables#runtime_dir() abort "{{{