diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts
index 0324fd61340..a61faa1779b 100644
--- a/src/vs/workbench/browser/parts/editor/editorStatus.ts
+++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts
@@ -662,9 +662,12 @@ export class ChangeModeAction extends Action {
 
 		// All languages are valid picks
 		const picks: IPickOpenEntry[] = languages.sort().map((lang, index) => {
-			return {
+			const languageModeId = this.modeService.getModeIdForLanguageName(lang.toLowerCase());
+			const configureLabel = nls.localize('configuredLanguage', "Configured Language");
+
+			return <IPickOpenEntry>{
 				label: lang,
-				description: currentModeId === lang ? nls.localize('configuredLanguage', "Configured Language") : void 0
+				description: currentModeId === lang ? `${languageModeId} (${configureLabel})` : languageModeId
 			};
 		});
 		picks[0].separator = { border: true, label: nls.localize('languagesPicks', "languages") };