diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooter.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooter.tsx
index 1369a1162b..f1f7e0031d 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooter.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooter.tsx
@@ -25,6 +25,7 @@ const tableFooterStyles = composes(
   css`
     ToolsPanel {
       align-items: center;
+      flex: 0 0 auto;
     }
     count input,
     count placeholder {
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenuItem.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenuItem.tsx
index 2fbc663fbd..23846e0c63 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenuItem.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenuItem.tsx
@@ -73,6 +73,7 @@ export const TableFooterMenuItem = observer(function TableFooterMenuItem({
   return styled(styles)(
     <MenuTrigger
       {...props}
+      title={translate(menuItem.tooltip)}
       panel={menuItem.panel}
       disabled={menuItem.isDisabled}
       style={[tableFooterMenuStyles]}