diff --git a/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts b/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts
index cdbc65afbc079fd74d6fadabf7420c4c6849c02a..3456d7b4f41f3524bdb3c75037f349cbee859f1a 100644
--- a/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts
@@ -81,7 +81,7 @@ export class TerminalSupport {
 			shellType = ShellType.cmd;
 		} else if (shell.indexOf('bash') >= 0) {
 			shellType = ShellType.bash;
-		} else if (shell.indexOf('c:\\program files\\git\\bin\\bash.exe') >= 0) {
+		} else if (shell.indexOf('git\\bin\\bash.exe') >= 0) {
 			shellType = ShellType.bash;
 		}
 
@@ -105,8 +105,12 @@ export class TerminalSupport {
 						command += `$env:${key}='${args.env[key]}'; `;
 					}
 				}
-				for (let a of args.args) {
-					command += `${quote(a)} `;
+				if (args.args && args.args.length > 0) {
+					const cmd = quote(args.args.shift());
+					command += (cmd[0] === '\'') ? `& ${cmd} ` : `${cmd} `;
+					for (let a of args.args) {
+						command += `${quote(a)} `;
+					}
 				}
 				break;