diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts
index a1d1c0f722221..845fbfa3c9cb3 100644
--- a/src/vs/editor/common/modes.ts
+++ b/src/vs/editor/common/modes.ts
@@ -438,8 +438,6 @@ export interface CompletionItem {
 	command?: Command;
 	/**@internal*/
 	noWhitespaceAdjust?: boolean;
-	/**@internal*/
-	noAutoAccept?: boolean;
 
 	/**@internal*/
 	_labelLow?: string;
diff --git a/src/vs/editor/common/services/editorSimpleWorker.ts b/src/vs/editor/common/services/editorSimpleWorker.ts
index e715ae921379a..81be846bc0322 100644
--- a/src/vs/editor/common/services/editorSimpleWorker.ts
+++ b/src/vs/editor/common/services/editorSimpleWorker.ts
@@ -515,7 +515,6 @@ export abstract class BaseEditorSimpleWorker {
 				kind: CompletionItemKind.Text,
 				label: word,
 				insertText: word,
-				noAutoAccept: true,
 				range: { startLineNumber: position.lineNumber, startColumn: currentWord.startColumn, endLineNumber: position.lineNumber, endColumn: currentWord.endColumn }
 			});
 		}
diff --git a/src/vs/editor/contrib/suggest/suggest.ts b/src/vs/editor/contrib/suggest/suggest.ts
index 437de1663240c..70274ba7818a8 100644
--- a/src/vs/editor/contrib/suggest/suggest.ts
+++ b/src/vs/editor/contrib/suggest/suggest.ts
@@ -21,7 +21,6 @@ export const Context = {
 	Visible: new RawContextKey<boolean>('suggestWidgetVisible', false),
 	MultipleSuggestions: new RawContextKey<boolean>('suggestWidgetMultipleSuggestions', false),
 	MakesTextEdit: new RawContextKey('suggestionMakesTextEdit', true),
-	AcceptOnKey: new RawContextKey<boolean>('suggestionSupportsAcceptOnKey', true),
 	AcceptSuggestionsOnEnter: new RawContextKey<boolean>('acceptSuggestionOnEnter', true)
 };
 
diff --git a/src/vs/editor/contrib/suggest/suggestWidget.ts b/src/vs/editor/contrib/suggest/suggestWidget.ts
index 3d4bfaca44fe6..452897839124f 100644
--- a/src/vs/editor/contrib/suggest/suggestWidget.ts
+++ b/src/vs/editor/contrib/suggest/suggestWidget.ts
@@ -403,7 +403,6 @@ export class SuggestWidget implements IContentWidget, IListVirtualDelegate<IComp
 
 	private suggestWidgetVisible: IContextKey<boolean>;
 	private suggestWidgetMultipleSuggestions: IContextKey<boolean>;
-	private suggestionSupportsAutoAccept: IContextKey<boolean>;
 
 	private readonly editorBlurTimeout = new TimeoutTimer();
 	private readonly showTimeout = new TimeoutTimer();
@@ -479,7 +478,6 @@ export class SuggestWidget implements IContentWidget, IListVirtualDelegate<IComp
 
 		this.suggestWidgetVisible = SuggestContext.Visible.bindTo(contextKeyService);
 		this.suggestWidgetMultipleSuggestions = SuggestContext.MultipleSuggestions.bindTo(contextKeyService);
-		this.suggestionSupportsAutoAccept = SuggestContext.AcceptOnKey.bindTo(contextKeyService);
 
 		this.editor.addContentWidget(this);
 		this.setState(State.Hidden);
@@ -590,9 +588,6 @@ export class SuggestWidget implements IContentWidget, IListVirtualDelegate<IComp
 				this.currentSuggestionDetails = null;
 			}
 
-
-			this.suggestionSupportsAutoAccept.set(!item.suggestion.noAutoAccept);
-
 			this.focusedItem = item;
 
 			this.list.reveal(index);
@@ -1085,7 +1080,6 @@ export class SuggestWidget implements IContentWidget, IListVirtualDelegate<IComp
 
 	dispose(): void {
 		this.state = null;
-		this.suggestionSupportsAutoAccept = null;
 		this.currentSuggestionDetails = null;
 		this.focusedItem = null;
 		this.element = null;
diff --git a/src/vs/workbench/parts/snippets/electron-browser/snippetCompletionProvider.ts b/src/vs/workbench/parts/snippets/electron-browser/snippetCompletionProvider.ts
index 21d83c137b861..faa2d3f857a7f 100644
--- a/src/vs/workbench/parts/snippets/electron-browser/snippetCompletionProvider.ts
+++ b/src/vs/workbench/parts/snippets/electron-browser/snippetCompletionProvider.ts
@@ -25,7 +25,6 @@ export class SnippetCompletion implements CompletionItem {
 	documentation: MarkdownString;
 	range: IRange;
 	sortText: string;
-	noAutoAccept: boolean;
 	kind: CompletionItemKind;
 	insertTextIsSnippet: true;
 
@@ -38,7 +37,6 @@ export class SnippetCompletion implements CompletionItem {
 		this.insertText = snippet.body;
 		this.range = range;
 		this.sortText = `${snippet.snippetSource === SnippetSource.Extension ? 'z' : 'a'}-${snippet.prefix}`;
-		this.noAutoAccept = true;
 		this.kind = CompletionItemKind.Snippet;
 		this.insertTextIsSnippet = true;
 	}