diff --git a/src/vs/workbench/api/electron-browser/mainThreadComments.ts b/src/vs/workbench/api/electron-browser/mainThreadComments.ts
index d28e90fa2ee..48c07b635e0 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadComments.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadComments.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { ICodeEditor, IDiffEditor } from 'vs/editor/browser/editorBrowser';
+import { ICodeEditor, getCodeEditor } from 'vs/editor/browser/editorBrowser';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import * as modes from 'vs/editor/common/modes';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
@@ -114,25 +114,7 @@ export class MainThreadComments extends Disposable implements MainThreadComments
 	}
 
 	getFocusedEditor(): ICodeEditor {
-		let editor = this._codeEditorService.getFocusedCodeEditor();
-		if (!editor) {
-			/* please note that the type of `this._editorService.activeTextEditorWidget` is  `{ IEditor as ICodeEditor } from 'vs/editor/common/editorCommon'`
-			 * It's `IEditor` but renamed to `ICodeEditor`. The `ICodeEditor` in current context is `import { ICodeEditor } from 'vs/editor/browser/editorBrowser'`
-			 * this._editorService.activeTextEditorWidget is
-			 * 1. ICodeEditor extends editorCommon.IEditor
-			 * 2. IDiffEditor extends editorCommon.IEditor
-			 */
-			const activeTextEditorWidget = this._editorService.activeTextEditorWidget;
-			if (activeTextEditorWidget) {
-				if ((activeTextEditorWidget as ICodeEditor).getContribution) {
-					return activeTextEditorWidget as ICodeEditor;
-				} else {
-					return (activeTextEditorWidget as IDiffEditor).getModifiedEditor();
-				}
-			}
-		}
-
-		return editor;
+		return this._codeEditorService.getFocusedCodeEditor() || getCodeEditor(this._editorService.activeControl);
 	}
 
 	async provideWorkspaceComments(): Promise<modes.CommentThread[]> {