diff --git a/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx b/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx
index f7e9b09289f..90da9adfd77 100644
--- a/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx
+++ b/packages/grafana-ui/src/components/PanelChrome/PanelChrome.tsx
@@ -403,6 +403,7 @@ const getStyles = (theme: GrafanaTheme2) => {
     content: css({
       label: 'panel-content',
       flexGrow: 1,
+      contain: 'strict',
     }),
     headerContainer: css({
       label: 'panel-header',
diff --git a/public/app/plugins/panel/text/TextPanel.tsx b/public/app/plugins/panel/text/TextPanel.tsx
index d831532f48a..3252c3fb718 100644
--- a/public/app/plugins/panel/text/TextPanel.tsx
+++ b/public/app/plugins/panel/text/TextPanel.tsx
@@ -51,7 +51,7 @@ export function TextPanel(props: Props) {
   }
 
   return (
-    <CustomScrollbar autoHeightMin="100%" className={styles.containStrict}>
+    <CustomScrollbar autoHeightMin="100%">
       <DangerouslySetHtmlContent
         html={processed.content}
         className={styles.markdown}
@@ -103,7 +103,4 @@ const getStyles = (theme: GrafanaTheme2) => ({
       height: 100%;
     `
   ),
-  containStrict: css({
-    contain: 'strict',
-  }),
 });
diff --git a/public/sass/pages/_dashboard.scss b/public/sass/pages/_dashboard.scss
index e46ab1d0108..77c985f4435 100644
--- a/public/sass/pages/_dashboard.scss
+++ b/public/sass/pages/_dashboard.scss
@@ -46,6 +46,7 @@
   padding: $panel-padding;
   width: 100%;
   flex-grow: 1;
+  contain: strict;
   height: calc(100% - #{$panel-header-height});
 
   &--no-padding {