diff --git a/packages/grafana-ui/src/components/ToolbarButton/ToolbarButton.tsx b/packages/grafana-ui/src/components/ToolbarButton/ToolbarButton.tsx
index 413d7b493a9..fa53277d9fe 100644
--- a/packages/grafana-ui/src/components/ToolbarButton/ToolbarButton.tsx
+++ b/packages/grafana-ui/src/components/ToolbarButton/ToolbarButton.tsx
@@ -159,6 +159,10 @@ const getStyles = (theme: GrafanaTheme2) => {
         }),
       },
 
+      [theme.breakpoints.down('md')]: {
+        width: 'auto !important',
+      },
+
       '&:focus, &:focus-visible': {
         ...getFocusStyles(theme),
         zIndex: 1,