diff --git a/src/vs/editor/contrib/codeAction/browser/codeActionWidget.ts b/src/vs/editor/contrib/codeAction/browser/codeActionWidget.ts
index 7c3180aa563..559128914f4 100644
--- a/src/vs/editor/contrib/codeAction/browser/codeActionWidget.ts
+++ b/src/vs/editor/contrib/codeAction/browser/codeActionWidget.ts
@@ -419,7 +419,6 @@ export class CodeActionWidget extends Disposable {
 	}
 
 	public hide() {
-		this._ctxMenuWidgetVisible.reset();
 		this.codeActionList.clear();
 		this._contextViewService.hideContextView();
 	}
@@ -530,6 +529,7 @@ export class CodeActionWidget extends Disposable {
 		});
 
 		this.currentShowingContext = undefined;
+		this._ctxMenuWidgetVisible.reset();
 		delegate.onHide(cancelled);
 	}