diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
index db34ae06e6a46005dd1b7eb00862eecf426eb6c8..80ae6faffc32d3f9d976f5ad964f01f97776f7ea 100644
--- a/src/vs/workbench/browser/layout.ts
+++ b/src/vs/workbench/browser/layout.ts
@@ -643,7 +643,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			// To properly reset line numbers we need to read the configuration for each editor respecting it's uri.
 			if (!lineNumbers && isCodeEditor(editor) && editor.hasModel()) {
 				const model = editor.getModel();
-				lineNumbers = this.configurationService.getValue('editor.lineNumbers', { resource: model.uri });
+				lineNumbers = this.configurationService.getValue('editor.lineNumbers', { resource: model.uri, overrideIdentifier: model.getModeId() });
 			}
 			if (!lineNumbers) {
 				lineNumbers = this.configurationService.getValue('editor.lineNumbers');