diff --git a/src/vs/editor/contrib/suggest/browser/suggestController.ts b/src/vs/editor/contrib/suggest/browser/suggestController.ts
index 1b9332f32aacf2814f4f058c5eeb2946bbe92bb7..5cbf0f0c32a2aea1a63f75588a74eccc9cadb07a 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestController.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestController.ts
@@ -105,9 +105,14 @@ export class SuggestController implements IEditorContribution {
 		// Wire up logic to accept a suggestion on certain characters
 		const autoAcceptOracle = new AcceptOnCharacterOracle(editor, this.widget, item => this.onDidSelectItem(item));
 		this.toDispose.push(
+			autoAcceptOracle,
 			this.model.onDidCancel(autoAcceptOracle.reset, autoAcceptOracle),
 			this.model.onDidTrigger(autoAcceptOracle.reset, autoAcceptOracle),
-			autoAcceptOracle
+			this.model.onDidSuggest(e => {
+				if (e.completionModel.items.length === 0) {
+					autoAcceptOracle.reset();
+				}
+			})
 		);
 	}