diff --git a/src/vs/workbench/contrib/debug/browser/debugActions.ts b/src/vs/workbench/contrib/debug/browser/debugActions.ts
index 78911d38cac699a376830ef20bbdf0026b78bbdc..d9da4e625742a02cb9ae3b581b9d00ff31c42235 100644
--- a/src/vs/workbench/contrib/debug/browser/debugActions.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugActions.ts
@@ -82,7 +82,7 @@ export class ConfigureAction extends AbstractDebugAction {
 	}
 
 	async run(event?: any): Promise<any> {
-		if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
+		if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY || this.contextService.getWorkspace().folders.length === 0) {
 			this.notificationService.info(nls.localize('noFolderDebugConfig', "Please first open a folder in order to do advanced debug configuration."));
 			return;
 		}
@@ -97,7 +97,7 @@ export class ConfigureAction extends AbstractDebugAction {
 				launch = launches[0];
 			} else {
 				const picks = launches.map(l => ({ label: l.name, launch: l }));
-				const picked = await this.quickInputService.pick<{ label: string, launch: ILaunch }>(picks, { activeItem: picks[0], placeHolder: nls.localize('selectWorkspaceFolder', "Select a workspace folder to create a launch.json file in") });
+				const picked = await this.quickInputService.pick<{ label: string, launch: ILaunch }>(picks, { activeItem: picks[0], placeHolder: nls.localize('selectWorkspaceFolder', "Select a workspace folder to create a launch.json file in or add it to the workspace config file") });
 				if (picked) {
 					launch = picked.launch;
 				}
diff --git a/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts b/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts
index 92123a1e9e3c6b310d83d5851eff6a20a04496bd..bb1b5b180703f368e4d6de3d79c8e9a05d5b9274 100644
--- a/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts
@@ -388,7 +388,7 @@ export class ConfigurationManager implements IConfigurationManager {
 		if (this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
 			this.launches.push(this.instantiationService.createInstance(WorkspaceLaunch, this));
 		}
-		this.launches.push(this.instantiationService.createInstance(UserLaunch));
+		this.launches.push(this.instantiationService.createInstance(UserLaunch, this));
 
 		if (this.selectedLaunch && this.launches.indexOf(this.selectedLaunch) === -1) {
 			this.selectConfiguration(undefined);
@@ -566,6 +566,9 @@ export class ConfigurationManager implements IConfigurationManager {
 abstract class AbstractLaunch {
 	protected abstract getConfig(): IGlobalConfig | undefined;
 
+	constructor(protected configurationManager: ConfigurationManager) {
+	}
+
 	getCompound(name: string): ICompound | undefined {
 		const config = this.getConfig();
 		if (!config || !config.compounds) {
@@ -606,6 +609,16 @@ abstract class AbstractLaunch {
 		return config.configurations.find(config => config && config.name === name);
 	}
 
+	async getInitialConfigurationContent(folderUri?: uri, type?: string, token?: CancellationToken): Promise<string> {
+		let content = '';
+		const adapter = await this.configurationManager.guessDebugger(type);
+		if (adapter) {
+			const initialConfigs = await this.configurationManager.provideDebugConfigurations(folderUri, adapter.type, token || CancellationToken.None);
+			content = await adapter.getInitialConfigurationContent(initialConfigs);
+		}
+		return content;
+	}
+
 	get hidden(): boolean {
 		return false;
 	}
@@ -614,14 +627,14 @@ abstract class AbstractLaunch {
 class Launch extends AbstractLaunch implements ILaunch {
 
 	constructor(
-		private configurationManager: ConfigurationManager,
+		configurationManager: ConfigurationManager,
 		public workspace: IWorkspaceFolder,
 		@IFileService private readonly fileService: IFileService,
 		@ITextFileService private readonly textFileService: ITextFileService,
 		@IEditorService private readonly editorService: IEditorService,
 		@IConfigurationService private readonly configurationService: IConfigurationService
 	) {
-		super();
+		super(configurationManager);
 	}
 
 	get uri(): uri {
@@ -645,12 +658,7 @@ class Launch extends AbstractLaunch implements ILaunch {
 			content = fileContent.value.toString();
 		} catch {
 			// launch.json not found: create one by collecting launch configs from debugConfigProviders
-			const adapter = await this.configurationManager.guessDebugger(type);
-
-			if (adapter) {
-				const initialConfigs = await this.configurationManager.provideDebugConfigurations(this.workspace.uri, adapter.type, token || CancellationToken.None);
-				content = await adapter.getInitialConfigurationContent(initialConfigs);
-			}
+			content = await this.getInitialConfigurationContent(this.workspace.uri, type, token);
 			if (content) {
 				created = true; // pin only if config file is created #8727
 				try {
@@ -693,12 +701,12 @@ class Launch extends AbstractLaunch implements ILaunch {
 
 class WorkspaceLaunch extends AbstractLaunch implements ILaunch {
 	constructor(
-		private configurationManager: ConfigurationManager,
+		configurationManager: ConfigurationManager,
 		@IEditorService private readonly editorService: IEditorService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService
 	) {
-		super();
+		super(configurationManager);
 	}
 
 	get workspace(): undefined {
@@ -710,7 +718,7 @@ class WorkspaceLaunch extends AbstractLaunch implements ILaunch {
 	}
 
 	get name(): string {
-		return nls.localize('workspace', "workspace");
+		return nls.localize('workspace', "Workspace");
 	}
 
 	protected getConfig(): IGlobalConfig | undefined {
@@ -718,28 +726,19 @@ class WorkspaceLaunch extends AbstractLaunch implements ILaunch {
 	}
 
 	async openConfigFile(sideBySide: boolean, preserveFocus: boolean, type?: string, token?: CancellationToken): Promise<{ editor: IEditorPane | null, created: boolean }> {
-		const ws = this.contextService.getWorkspace();
-
-		if (ws.folders.length === 0) {
-			return { editor: null, created: false };
-		}
-
 		let launchExistInFile = !!this.getConfig();
 		if (!launchExistInFile) {
 			// Launch property in workspace config not found: create one by collecting launch configs from debugConfigProviders
-			let content = '';
-			const adapter = await this.configurationManager.guessDebugger(type);
-			if (adapter) {
-				const initialConfigs = await this.configurationManager.provideDebugConfigurations(undefined, adapter.type, token || CancellationToken.None);
-				content = await adapter.getInitialConfigurationContent(initialConfigs);
-			}
+			let content = await this.getInitialConfigurationContent(undefined, type, token);
 			if (content) {
 				await this.configurationService.updateValue('launch', json.parse(content), ConfigurationTarget.WORKSPACE);
+			} else {
+				return { editor: null, created: false };
 			}
 		}
 
 		const editor = await this.editorService.openEditor({
-			resource: ws.configuration!,
+			resource: this.contextService.getWorkspace().configuration!,
 			options: { preserveFocus }
 		}, sideBySide ? SIDE_GROUP : ACTIVE_GROUP);
 
@@ -753,10 +752,11 @@ class WorkspaceLaunch extends AbstractLaunch implements ILaunch {
 class UserLaunch extends AbstractLaunch implements ILaunch {
 
 	constructor(
+		configurationManager: ConfigurationManager,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IPreferencesService private readonly preferencesService: IPreferencesService
 	) {
-		super();
+		super(configurationManager);
 	}
 
 	get workspace(): undefined {