diff --git a/.gitignore b/.gitignore
index 3431088..5ce4390 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ Version v*
 .github_changelog_generator
 launcher/.vs
 launcher/src/version.rc2
+.vs/*
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d03b591..f0f6baf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Change Log
 
-## [Unreleased](https://ci.appveyor.com/project/MartiUK/cmder/build/artifacts) (2022-03-17)
+## [1.3.20-unreleased](https://ci.appveyor.com/project/MartiUK/cmder/build/artifacts) (2022-03-17)
 
 ### Changes
 
@@ -9,6 +9,7 @@
 
 ### Fixes
 
+- Fix #2740
 - Fix find and use latest Git install always using vendored Git.
 - Fix using Git from vendored Git and other Git for Windows tools from other Git in path.
 - Remove setting `term=cygwin` in `init.bat` to fix random `ABCD` characters when using arrow keys in `vim`.
diff --git a/Cmder.bat b/Cmder.bat
index 6a95148..3062c37 100644
--- a/Cmder.bat
+++ b/Cmder.bat
@@ -4,8 +4,12 @@ SET CMDER_ROOT=%~dp0
 :: Remove Trailing '\'
 @if "%CMDER_ROOT:~-1%" == "\" SET CMDER_ROOT=%CMDER_ROOT:~0,-1%
 
+if not exist "%CMDER_ROOT%\config\user_ConEmu.xml" (
+  copy "%CMDER_ROOT%\vendor\ConEmu.xml.default" "%CMDER_ROOT%\config\user_ConEmu.xml"
+)
+
 if exist "%~1" (
     start %~dp0/vendor/conemu-maximus5/ConEmu.exe /Icon "%CMDER_ROOT%\icons\cmder.ico" /Title Cmder /LoadCfgFile "%~1"
 ) else (
-    start %~dp0/vendor/conemu-maximus5/ConEmu.exe /Icon "%CMDER_ROOT%\icons\cmder.ico" /Title Cmder /LoadCfgFile "%CMDER_ROOT%\config\ConEmu.xml"
+    start %~dp0/vendor/conemu-maximus5/ConEmu.exe /Icon "%CMDER_ROOT%\icons\cmder.ico" /Title Cmder /LoadCfgFile "%CMDER_ROOT%\config\user_ConEmu.xml"
 )
diff --git a/vendor/lib/lib_path.cmd b/vendor/lib/lib_path.cmd
index 933d2f3..6e05aad 100644
--- a/vendor/lib/lib_path.cmd
+++ b/vendor/lib/lib_path.cmd
@@ -121,11 +121,11 @@ exit /b
     exit /b
 
     :toolong
-      echo "%OLD_PATH%">tempfileA
-      echo "%PATH%">tempfileB
-      fc /b tempfileA tempfileB 2>nul 1>nul
-      if errorlevel 1 ( del tempfileA & del tempfileB & goto :changed )
-      del tempfileA & del tempfileB
+      echo "%OLD_PATH%">"%temp%\cmder_lib_pathA"
+      echo "%PATH%">"%temp%\cmder_lib_pathB"
+      fc /b "%temp%\cmder_lib_pathA" "%temp%\cmder_lib_pathB" 2>nul 1>nul
+      if errorlevel 1 ( del "%temp%\cmder_lib_pathA" & del "%temp%\cmder_lib_pathB" & goto :changed )
+      del "%temp%\cmder_lib_pathA" & del "%temp%\cmder_lib_pathB"
       exit /b
 
     :changed