diff --git a/src/vs/workbench/parts/debug/common/debug.ts b/src/vs/workbench/parts/debug/common/debug.ts
index 0c28a3e0db4..95dcc3ec20e 100644
--- a/src/vs/workbench/parts/debug/common/debug.ts
+++ b/src/vs/workbench/parts/debug/common/debug.ts
@@ -405,6 +405,7 @@ export interface IConfig extends IEnvConfig {
 	// internals
 	__sessionId?: string;
 	__restart?: any;
+	__autoAttach?: boolean;
 	port?: number; // TODO
 }
 
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
index 037465b796b..cadb15fa3e5 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
@@ -717,7 +717,11 @@ export class DebugService implements IDebugService {
 						this.panelService.openPanel(REPL_ID, false).done(undefined, errors.onUnexpectedError);
 					}
 
-					this.showError(errorMessage, errors.isErrorWithActions(error) ? error.actions : []);
+					if (resolved && resolved.request === 'attach' && resolved.__autoAttach) {
+						// ignore attach timeouts in auto attach mode
+					} else {
+						this.showError(errorMessage, errors.isErrorWithActions(error) ? error.actions : []);
+					}
 					return undefined;
 				});
 		});