diff --git a/packages/grafana-ui/src/themes/mixins.ts b/packages/grafana-ui/src/themes/mixins.ts
index aa2043743ef..cb6956cccf1 100644
--- a/packages/grafana-ui/src/themes/mixins.ts
+++ b/packages/grafana-ui/src/themes/mixins.ts
@@ -65,7 +65,8 @@ export function getFocusStyles(theme: GrafanaThemeV2): CSSObject {
 // max-width is set up based on .grafana-tooltip class that's used in dashboard
 export const getTooltipContainerStyles = (theme: GrafanaThemeV2) => `
   overflow: hidden;
-  background: ${theme.components.tooltip.background};
+  background: ${theme.colors.background.secondary};
+  box-shadow: ${theme.shadows.z2};
   max-width: 800px;
   padding: ${theme.spacing(1)};
   border-radius: ${theme.shape.borderRadius()};