diff --git a/src/vs/editor/contrib/hover/hover.ts b/src/vs/editor/contrib/hover/hover.ts
index c84a2bbde87..071253cbd0c 100644
--- a/src/vs/editor/contrib/hover/hover.ts
+++ b/src/vs/editor/contrib/hover/hover.ts
@@ -139,7 +139,7 @@ export class ModesHoverController implements IEditorContribution {
 	private _onEditorMouseMove(mouseEvent: IEditorMouseEvent): void {
 		let targetType = mouseEvent.target.type;
 
-		if (this._isMouseDown && this._hoverClicked && this._contentWidget?.isColorPickerVisible()) {
+		if (this._isMouseDown && this._hoverClicked) {
 			return;
 		}
 
@@ -219,6 +219,7 @@ export class ModesHoverController implements IEditorContribution {
 			return;
 		}
 
+		this._hoverClicked = false;
 		this._glyphWidget?.hide();
 		this._contentWidget?.hide();
 	}
diff --git a/src/vs/editor/contrib/hover/modesContentHover.ts b/src/vs/editor/contrib/hover/modesContentHover.ts
index 431ad301d30..ee10d9b8003 100644
--- a/src/vs/editor/contrib/hover/modesContentHover.ts
+++ b/src/vs/editor/contrib/hover/modesContentHover.ts
@@ -445,10 +445,7 @@ export class ModesContentHoverWidget extends Widget implements IContentWidget, I
 	}
 
 	public isColorPickerVisible(): boolean {
-		if (this._colorPicker) {
-			return true;
-		}
-		return false;
+		return !!this._colorPicker;
 	}
 
 	public onContentsChanged(): void {