diff --git a/vendor/start_git_bash.cmd b/vendor/start_git_bash.cmd
index 136feab..679c5af 100644
--- a/vendor/start_git_bash.cmd
+++ b/vendor/start_git_bash.cmd
@@ -44,4 +44,8 @@ if exist "%CMDER_ROOT%\vendor\git-for-windows" (
   )
 )
 
-"%gitCmd%" --no-cd %gitCommand% "%bashCmd%" --login -i
+if defined ConEmuDir (
+  "%gitCmd%" --no-cd %gitCommand% "%bashCmd%" --login -i
+) else (
+  "%bashCmd%" --login -i
+)