diff --git a/src/tsconfig.strictNullChecks.json b/src/tsconfig.strictNullChecks.json
index abca42eeb3cc4338b4034ef62d14b63eceeb885b..278f45d075da15c60459837dd07676dde99091ae 100644
--- a/src/tsconfig.strictNullChecks.json
+++ b/src/tsconfig.strictNullChecks.json
@@ -233,6 +233,7 @@
 		"./vs/workbench/contrib/comments/common/commentModel.ts",
 		"./vs/workbench/contrib/comments/common/commentThreadWidget.ts",
 		"./vs/workbench/contrib/comments/electron-browser/commentGlyphWidget.ts",
+		"./vs/workbench/contrib/comments/electron-browser/commentsTreeViewer.ts",
 		"./vs/workbench/contrib/comments/electron-browser/reactionsAction.ts",
 		"./vs/workbench/contrib/comments/electron-browser/simpleCommentEditor.ts",
 		"./vs/workbench/contrib/debug/browser/baseDebugView.ts",
@@ -424,6 +425,7 @@
 		"./vs/workbench/services/history/common/history.ts",
 		"./vs/workbench/services/integrity/common/integrity.ts",
 		"./vs/workbench/services/integrity/node/integrityService.ts",
+		"./vs/workbench/services/keybinding/common/keybindingEditing.ts",
 		"./vs/workbench/services/keybinding/common/keybindingIO.ts",
 		"./vs/workbench/services/keybinding/common/keyboardMapper.ts",
 		"./vs/workbench/services/keybinding/common/macLinuxFallbackKeyboardMapper.ts",
diff --git a/src/vs/workbench/services/keybinding/common/keybindingEditing.ts b/src/vs/workbench/services/keybinding/common/keybindingEditing.ts
index a07d898faf59cdde4d4e639a595a3129af7655f2..a3acb45efc46577d719f78d2a4f9750ffe9806bd 100644
--- a/src/vs/workbench/services/keybinding/common/keybindingEditing.ts
+++ b/src/vs/workbench/services/keybinding/common/keybindingEditing.ts
@@ -15,7 +15,7 @@ import { EditOperation } from 'vs/editor/common/core/editOperation';
 import { Range } from 'vs/editor/common/core/range';
 import { Selection } from 'vs/editor/common/core/selection';
 import { ITextModel } from 'vs/editor/common/model';
-import { ITextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
+import { ITextModelService, IResolvedTextEditorModel } from 'vs/editor/common/services/resolverService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
@@ -207,7 +207,7 @@ export class KeybindingsEditingService extends Disposable implements IKeybinding
 	}
 
 
-	private resolveModelReference(): Promise<IReference<ITextEditorModel>> {
+	private resolveModelReference(): Promise<IReference<IResolvedTextEditorModel>> {
 		return this.fileService.existsFile(this.resource)
 			.then(exists => {
 				const EOL = this.configurationService.getValue('files', { overrideIdentifier: 'json' })['eol'];
@@ -216,7 +216,7 @@ export class KeybindingsEditingService extends Disposable implements IKeybinding
 			});
 	}
 
-	private resolveAndValidate(): Promise<IReference<ITextEditorModel>> {
+	private resolveAndValidate(): Promise<IReference<IResolvedTextEditorModel>> {
 
 		// Target cannot be dirty if not writing into buffer
 		if (this.textFileService.isDirty(this.resource)) {