diff --git a/plugin/fzf.vim b/plugin/fzf.vim
index 6055b245..ac4c98fd 100644
--- a/plugin/fzf.vim
+++ b/plugin/fzf.vim
@@ -50,9 +50,15 @@ if s:is_win
   " Use utf-8 for fzf.vim commands
   " Return array of shell commands for cmd.exe
   function! s:wrap_cmds(cmds)
-    return map(['@echo off', 'setlocal enabledelayedexpansion', 'for /f "delims=: tokens=2" %%a in (''chcp'') do set origchcp=%%a', 'set origchcp=!origchcp: =!', 'chcp 65001 > nul'] +
-          \ (type(a:cmds) == type([]) ? a:cmds : [a:cmds]) +
-          \ ['chcp !origchcp! > nul', 'setlocal disabledelayedexpansion'], 'v:val."\r"')
+    return map([
+      \ '@echo off',
+      \ 'setlocal enabledelayedexpansion',
+      \ 'for /f "tokens=*" %%a in (''chcp'') do for %%b in (%%a) do set origchcp=%%b',
+      \ 'chcp 65001 > nul'
+    \ ]
+    \ + (type(a:cmds) == type([]) ? a:cmds : [a:cmds])
+    \ + ['chcp !origchcp! > nul', 'endlocal'],
+    \ 'v:val."\r"')
   endfunction
 else
   let s:term_marker = ";#FZF"