diff --git a/packages/grafana-ui/src/components/Chart/TooltipContainer.tsx b/packages/grafana-ui/src/components/Chart/TooltipContainer.tsx
index 80209c20317..1452d47ed4c 100644
--- a/packages/grafana-ui/src/components/Chart/TooltipContainer.tsx
+++ b/packages/grafana-ui/src/components/Chart/TooltipContainer.tsx
@@ -18,8 +18,8 @@ const getTooltipContainerStyles = stylesFactory((theme: GrafanaTheme) => {
     wrapper: css`
       overflow: hidden;
       background: ${bgColor};
-      /* 30% is an arbitrary choice. We can be more clever about calculating tooltip\'s width */
-      max-width: 30%;
+      /* max-width is set up based on .grafana-tooltip class that's used in dashboard */
+      max-width: 800px;
       padding: ${theme.spacing.sm};
       border-radius: ${theme.border.radius.sm};
     `,