diff --git a/src/vs/base/browser/ui/actionbar/actionViewItems.ts b/src/vs/base/browser/ui/actionbar/actionViewItems.ts
index 804b0c386ac..a714411e3a2 100644
--- a/src/vs/base/browser/ui/actionbar/actionViewItems.ts
+++ b/src/vs/base/browser/ui/actionbar/actionViewItems.ts
@@ -226,7 +226,6 @@ export class BaseActionViewItem extends Disposable implements IActionViewItem {
 		const title = this.getTooltip() ?? '';
 		this.updateAriaLabel();
 
-		this.element.title = '';
 		if (!this.customHover) {
 			const hoverDelegate = this.options.hoverDelegate ?? getDefaultHoverDelegate('element');
 			this.customHover = setupCustomHover(hoverDelegate, this.element, title);
diff --git a/src/vs/platform/quickinput/browser/quickInputService.ts b/src/vs/platform/quickinput/browser/quickInputService.ts
index c2d178c4c46..2974eed8077 100644
--- a/src/vs/platform/quickinput/browser/quickInputService.ts
+++ b/src/vs/platform/quickinput/browser/quickInputService.ts
@@ -90,7 +90,7 @@ export class QuickInputService extends Themable implements IQuickInputService {
 				options: IWorkbenchListOptions<T>
 			) => this.instantiationService.createInstance(WorkbenchList, user, container, delegate, renderers, options) as List<T>,
 			styles: this.computeStyles(),
-			hoverDelegate: this.instantiationService.createInstance(QuickInputHoverDelegate)
+			hoverDelegate: this._register(this.instantiationService.createInstance(QuickInputHoverDelegate))
 		};
 
 		const controller = this._register(new QuickInputController({
diff --git a/src/vs/workbench/contrib/remote/browser/tunnelView.ts b/src/vs/workbench/contrib/remote/browser/tunnelView.ts
index 3559f22390e..102de6b52f8 100644
--- a/src/vs/workbench/contrib/remote/browser/tunnelView.ts
+++ b/src/vs/workbench/contrib/remote/browser/tunnelView.ts
@@ -355,7 +355,7 @@ class ActionBarRenderer extends Disposable implements ITableRenderer<ActionBarCe
 	) {
 		super();
 
-		this._hoverDelegate = getDefaultHoverDelegate('mouse', true);
+		this._hoverDelegate = this._register(getDefaultHoverDelegate('mouse', true));
 	}
 
 	set actionRunner(actionRunner: ActionRunner) {
diff --git a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
index 70afef1e015..06476f564c8 100644
--- a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
+++ b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
@@ -1149,7 +1149,7 @@ class TimelineTreeRenderer implements ITreeRenderer<TreeElement, FuzzyScore, Tim
 		@IThemeService private themeService: IThemeService,
 	) {
 		this.actionViewItemProvider = createActionViewItem.bind(undefined, this.instantiationService);
-		this._hoverDelegate = getDefaultHoverDelegate('element');
+		this._hoverDelegate = getDefaultHoverDelegate('mouse');
 	}
 
 	private uri: URI | undefined;