diff --git a/src/vs/editor/contrib/suggest/browser/suggestController.ts b/src/vs/editor/contrib/suggest/browser/suggestController.ts
index 7e669fcc1957f19cc2bf8d1e18af454a9169adfb..b9f355046573676438ff2db42bc3f123d2df248c 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestController.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestController.ts
@@ -236,7 +236,13 @@ export class TriggerSuggestAction extends EditorAction {
 	}
 
 	public run(accessor: ServicesAccessor, editor: ICommonCodeEditor): void {
-		SuggestController.get(editor).triggerSuggest();
+		const controller = SuggestController.get(editor);
+
+		if (!controller) {
+			return;
+		}
+
+		controller.triggerSuggest();
 	}
 }
 
diff --git a/src/vs/workbench/parts/scm/electron-browser/scmEditor.ts b/src/vs/workbench/parts/scm/electron-browser/scmEditor.ts
index b227157416043cbc24a6d06074c940a0d35bdb79..64449ee704c71131e799fd43334cc9963140038c 100644
--- a/src/vs/workbench/parts/scm/electron-browser/scmEditor.ts
+++ b/src/vs/workbench/parts/scm/electron-browser/scmEditor.ts
@@ -16,10 +16,6 @@ import { ICommandService } from 'vs/platform/commands/common/commands';
 import { MenuPreventer } from 'vs/editor/contrib/multicursor/browser/menuPreventer';
 import { SelectionClipboard } from 'vs/editor/contrib/selectionClipboard/electron-browser/selectionClipboard';
 import { ContextMenuController } from 'vs/editor/contrib/contextmenu/browser/contextmenu';
-import { SuggestController } from 'vs/editor/contrib/suggest/browser/suggestController';
-import { SnippetController } from 'vs/editor/contrib/snippet/common/snippetController';
-import { TabCompletionController } from 'vs/editor/contrib/suggest/browser/tabCompletion';
-import { ModesHoverController } from 'vs/editor/contrib/hover/browser/hover';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { IThemeService } from 'vs/workbench/services/themes/common/themeService';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
@@ -44,11 +40,7 @@ class SCMCodeEditorWidget extends CodeEditorWidget {
 		return [
 			MenuPreventer,
 			SelectionClipboard,
-			ContextMenuController,
-			SuggestController,
-			SnippetController,
-			TabCompletionController,
-			ModesHoverController
+			ContextMenuController
 		];
 	}