diff --git a/extensions/typescript-language-features/src/languageFeatures/organizeImports.ts b/extensions/typescript-language-features/src/languageFeatures/organizeImports.ts
index 09df327ed5044a641e3f5c3c35e6f9773f3a18d1..1cf85deb467daa9c4d77dde65bb10349c53d6775 100644
--- a/extensions/typescript-language-features/src/languageFeatures/organizeImports.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/organizeImports.ts
@@ -29,7 +29,7 @@ class OrganizeImportsCommand implements Command {
 		private readonly telemetryReporter: TelemetryReporter,
 	) { }
 
-	public async execute(file: string, sortOnly = false): Promise<boolean> {
+	public async execute(file: string, sortOnly = false): Promise<any> {
 		/* __GDPR__
 			"organizeImports.execute" : {
 				"${include}": [
@@ -50,11 +50,13 @@ class OrganizeImportsCommand implements Command {
 		};
 		const response = await this.client.interruptGetErr(() => this.client.execute('organizeImports', args, nulToken));
 		if (response.type !== 'response' || !response.body) {
-			return false;
+			return;
 		}
 
-		const edits = typeConverters.WorkspaceEdit.fromFileCodeEdits(this.client, response.body);
-		return vscode.workspace.applyEdit(edits);
+		if (response.body.length) {
+			const edits = typeConverters.WorkspaceEdit.fromFileCodeEdits(this.client, response.body);
+			return vscode.workspace.applyEdit(edits);
+		}
 	}
 }
 
diff --git a/src/vs/editor/contrib/codeAction/codeActionUi.ts b/src/vs/editor/contrib/codeAction/codeActionUi.ts
index 7a7abf66191ac387e0fd70700eba36877dd4669f..f8ff35a52b0aeaec683bb39b12ed9aef274b9750 100644
--- a/src/vs/editor/contrib/codeAction/codeActionUi.ts
+++ b/src/vs/editor/contrib/codeAction/codeActionUi.ts
@@ -84,6 +84,7 @@ export class CodeActionUi extends Disposable {
 				const validActionToApply = this.tryGetValidActionToApply(newState.trigger, actions);
 				if (validActionToApply) {
 					try {
+						this._lightBulbWidget.getValue().hide();
 						await this.delegate.applyCodeAction(validActionToApply, false);
 					} finally {
 						actions.dispose();