diff --git a/packages/grafana-sql/src/components/visual-query-builder/GroupByRow.tsx b/packages/grafana-sql/src/components/visual-query-builder/GroupByRow.tsx
index be8a87523cc..647c8beb5ee 100644
--- a/packages/grafana-sql/src/components/visual-query-builder/GroupByRow.tsx
+++ b/packages/grafana-sql/src/components/visual-query-builder/GroupByRow.tsx
@@ -51,7 +51,7 @@ function makeRenderColumn({ options }: { options?: Array<SelectableValue<string>
           menuShouldPortal
           onChange={({ value }) => value && onChangeItem(setGroupByField(value))}
         />
-        <AccessoryButton aria-label="Remove group by column" icon="times" variant="secondary" onClick={onDeleteItem} />
+        <AccessoryButton title="Remove group by column" icon="times" variant="secondary" onClick={onDeleteItem} />
       </InputGroup>
     );
   };
diff --git a/packages/grafana-sql/src/components/visual-query-builder/SelectRow.tsx b/packages/grafana-sql/src/components/visual-query-builder/SelectRow.tsx
index 5591fc237be..fc619e3854e 100644
--- a/packages/grafana-sql/src/components/visual-query-builder/SelectRow.tsx
+++ b/packages/grafana-sql/src/components/visual-query-builder/SelectRow.tsx
@@ -150,7 +150,7 @@ export function SelectRow({ sql, format, columns, onSqlChange, functions }: Sele
               />
             </EditorField>
             <Button
-              aria-label="Remove"
+              title="Remove column"
               type="button"
               icon="trash-alt"
               variant="secondary"
@@ -164,9 +164,9 @@ export function SelectRow({ sql, format, columns, onSqlChange, functions }: Sele
         type="button"
         onClick={addColumn}
         variant="secondary"
+        title="Add column"
         size="md"
         icon="plus"
-        aria-label="Add"
         className={styles.addButton}
       />
     </Stack>