diff --git a/src/vs/editor/browser/services/hoverService/hoverWidget.ts b/src/vs/editor/browser/services/hoverService/hoverWidget.ts
index ed929bc9..2d8e9ae9 100644
--- a/src/vs/editor/browser/services/hoverService/hoverWidget.ts
+++ b/src/vs/editor/browser/services/hoverService/hoverWidget.ts
@@ -222,7 +222,7 @@ export class HoverWidget extends Widget implements IHoverWidget {
 		}
 
 		// Show the hover hint if needed
-		if (hideOnHover && options.appearance?.showHoverHint) {
+		if (options.appearance?.showHoverHint) {
 			const statusBarElement = $('div.hover-row.status-bar');
 			const infoElement = $('div.info');
 			infoElement.textContent = localize('hoverhint', 'Hold {0} key to mouse over', isMacintosh ? 'Option' : 'Alt');
diff --git a/src/vs/editor/common/languages.ts b/src/vs/editor/common/languages.ts
index 32b937b6..fbb24ec6 100644
--- a/src/vs/editor/common/languages.ts
+++ b/src/vs/editor/common/languages.ts
@@ -2019,9 +2019,9 @@ export interface CommentThreadChangedEvent<T> {
 }
 
 export interface CodeLens {
-	range: IRange;  // the range of code
-	id?: string; // no idea what this is for
-	command?: Command; // command to run when they click the codeLens
+	range: IRange;
+	id?: string;
+	command?: Command;
 }
 
 export interface CodeLensList {
diff --git a/src/vs/editor/contrib/codeAction/browser/codeActionController.ts b/src/vs/editor/contrib/codeAction/browser/codeActionController.ts
index dbbe9a91..862459df 100644
--- a/src/vs/editor/contrib/codeAction/browser/codeActionController.ts
+++ b/src/vs/editor/contrib/codeAction/browser/codeActionController.ts
@@ -180,6 +180,12 @@ export class CodeActionController extends Disposable implements IEditorContribut
 			return;
 		}
 
+
+		const selection = this._editor.getSelection();
+		if (selection?.startLineNumber !== newState.position.lineNumber) {
+			return;
+		}
+
 		this._lightBulbWidget.value?.update(actions, newState.trigger, newState.position);
 
 		if (newState.trigger.type === CodeActionTriggerType.Invoke) {
diff --git a/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.ts b/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.ts
index 0395f421..bc71291b 100644
--- a/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.ts
+++ b/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.ts
@@ -75,6 +75,14 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 	private _gutterState: LightBulbState.State = LightBulbState.Hidden;
 	private _iconClasses: string[] = [];
 
+	private readonly lightbulbClasses = [
+		'codicon-' + GUTTER_LIGHTBULB_ICON.id,
+		'codicon-' + GUTTER_LIGHTBULB_AIFIX_AUTO_FIX_ICON.id,
+		'codicon-' + GUTTER_LIGHTBULB_AUTO_FIX_ICON.id,
+		'codicon-' + GUTTER_LIGHTBULB_AIFIX_ICON.id,
+		'codicon-' + GUTTER_SPARKLE_FILLED_ICON.id
+	];
+
 	private _preferredKbLabel?: string;
 	private _quickFixKbLabel?: string;
 
@@ -148,15 +156,8 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 		}));
 
 		this._register(this._editor.onMouseDown(async (e: IEditorMouseEvent) => {
-			const lightbulbClasses = [
-				'codicon-' + GUTTER_LIGHTBULB_ICON.id,
-				'codicon-' + GUTTER_LIGHTBULB_AIFIX_AUTO_FIX_ICON.id,
-				'codicon-' + GUTTER_LIGHTBULB_AUTO_FIX_ICON.id,
-				'codicon-' + GUTTER_LIGHTBULB_AIFIX_ICON.id,
-				'codicon-' + GUTTER_SPARKLE_FILLED_ICON.id
-			];
 
-			if (!e.target.element || !lightbulbClasses.some(cls => e.target.element && e.target.element.classList.contains(cls))) {
+			if (!e.target.element || !this.lightbulbClasses.some(cls => e.target.element && e.target.element.classList.contains(cls))) {
 				return;
 			}
 
@@ -247,7 +248,9 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 		let hasDecoration = false;
 		if (currLineDecorations) {
 			for (const decoration of currLineDecorations) {
-				if (decoration.options.glyphMarginClassName) {
+				const glyphClass = decoration.options.glyphMarginClassName;
+
+				if (glyphClass && !this.lightbulbClasses.some(className => glyphClass.includes(className))) {
 					hasDecoration = true;
 					break;
 				}
@@ -271,7 +274,6 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 				const currLineEmptyOrIndented = isLineEmptyOrIndented(lineNumber);
 				const notEmpty = !nextLineEmptyOrIndented && !prevLineEmptyOrIndented;
 
-
 				// check above and below. if both are blocked, display lightbulb in the gutter.
 				if (!nextLineEmptyOrIndented && !prevLineEmptyOrIndented && !hasDecoration) {
 					this.gutterState = new LightBulbState.Showing(actions, trigger, atPosition, {
@@ -280,7 +282,7 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 					});
 					this.renderGutterLightbub();
 					return this.hide();
-				} else if (prevLineEmptyOrIndented || endLine || (notEmpty && !currLineEmptyOrIndented)) {
+				} else if (prevLineEmptyOrIndented || endLine || (prevLineEmptyOrIndented && !currLineEmptyOrIndented)) {
 					effectiveLineNumber -= 1;
 				} else if (nextLineEmptyOrIndented || (notEmpty && currLineEmptyOrIndented)) {
 					effectiveLineNumber += 1;
diff --git a/src/vs/editor/contrib/rename/browser/renameWidget.ts b/src/vs/editor/contrib/rename/browser/renameWidget.ts
index b284cd51..1f6fcc14 100644
--- a/src/vs/editor/contrib/rename/browser/renameWidget.ts
+++ b/src/vs/editor/contrib/rename/browser/renameWidget.ts
@@ -318,7 +318,8 @@ export class RenameWidget implements IRenameWidget, IContentWidget, IDisposable
 	}
 
 	afterRender(position: ContentWidgetPositionPreference | null): void {
-		this._trace('invoking afterRender, position: ', position ? 'not null' : 'null');
+		// FIXME@ulugbekna: commenting trace log out until we start unmounting the widget from editor properly - https://github.com/microsoft/vscode/issues/226975
+		// this._trace('invoking afterRender, position: ', position ? 'not null' : 'null');
 		if (position === null) {
 			// cancel rename when input widget isn't rendered anymore
 			this.cancelInput(true, 'afterRender (because position is null)');
@@ -363,7 +364,7 @@ export class RenameWidget implements IRenameWidget, IContentWidget, IDisposable
 	}
 
 	cancelInput(focusEditor: boolean, caller: string): void {
-		this._trace(`invoking cancelInput, caller: ${caller}, _currentCancelInput: ${this._currentAcceptInput ? 'not undefined' : 'undefined'}`);
+		// this._trace(`invoking cancelInput, caller: ${caller}, _currentCancelInput: ${this._currentAcceptInput ? 'not undefined' : 'undefined'}`);
 		this._currentCancelInput?.(focusEditor);
 	}