diff --git a/src/sql/base/browser/ui/table/plugins/buttonColumn.plugin.ts b/src/sql/base/browser/ui/table/plugins/buttonColumn.plugin.ts
index b570f52084..3e5a2e7a34 100644
--- a/src/sql/base/browser/ui/table/plugins/buttonColumn.plugin.ts
+++ b/src/sql/base/browser/ui/table/plugins/buttonColumn.plugin.ts
@@ -43,6 +43,7 @@ export class ButtonColumn<T extends Slick.SlickData> extends BaseClickableColumn
 				return `<button tabindex=-1 class="${iconCssClasses} ${buttonTypeCssClass}" title="${escapedTitle}" aria-label="${escapedTitle}" ${disabledAttribute}>${buttonText}</button>`;
 			},
 			name: this.options.name,
+			toolTip: this.options.title,
 			resizable: this.options.resizable,
 			selectable: false
 		};
diff --git a/src/sql/base/browser/ui/table/plugins/rowMoveManager.plugin.ts b/src/sql/base/browser/ui/table/plugins/rowMoveManager.plugin.ts
index 0813b22d27..ecc298d636 100644
--- a/src/sql/base/browser/ui/table/plugins/rowMoveManager.plugin.ts
+++ b/src/sql/base/browser/ui/table/plugins/rowMoveManager.plugin.ts
@@ -53,7 +53,8 @@ export class RowMoveManager<T extends Slick.SlickData> extends BaseClickableColu
 			resizable: this.options.resizable,
 			selectable: false,
 			behavior: this.options.behavior,
-			cssClass: this.options.iconCssClass
+			cssClass: this.options.iconCssClass,
+			toolTip: this.options.title
 		};
 	}