diff --git a/src/vs/editor/common/commonCodeEditor.ts b/src/vs/editor/common/commonCodeEditor.ts
index c5285a837245bb334e2873f68a4b671af7a56304..c636c9f8f5fc354a70481e44fba9f5a3b7020e2f 100644
--- a/src/vs/editor/common/commonCodeEditor.ts
+++ b/src/vs/editor/common/commonCodeEditor.ts
@@ -858,6 +858,7 @@ export abstract class CommonCodeEditor extends Disposable implements editorCommo
 		if (this.model) {
 			this.domElement.setAttribute('data-mode-id', this.model.getLanguageIdentifier().language);
 			this._configuration.setIsDominatedByLongLines(this.model.isDominatedByLongLines());
+			this._configuration.setMaxLineNumber(this.model.getLineCount());
 
 			this.model.onBeforeAttached();
 
diff --git a/src/vs/editor/common/viewModel/viewModelImpl.ts b/src/vs/editor/common/viewModel/viewModelImpl.ts
index a7a7297e8810a3f6986e197732bae9b4c3acb366..c05068d4a837956635754bc0e67bd79dd468f2c7 100644
--- a/src/vs/editor/common/viewModel/viewModelImpl.ts
+++ b/src/vs/editor/common/viewModel/viewModelImpl.ts
@@ -120,8 +120,6 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
 			conf.wrappingInfo.wrappingIndent
 		);
 
-		this.configuration.setMaxLineNumber(this.model.getLineCount());
-
 		this.coordinatesConverter = new CoordinatesConverter(this.lines);
 
 		this.viewLayout = this._register(new ViewLayout(this.configuration, this.getLineCount()));