diff --git a/app/components/chart-shared.tsx b/app/components/chart-shared.tsx
index c9ae518e7..fb19deb4a 100644
--- a/app/components/chart-shared.tsx
+++ b/app/components/chart-shared.tsx
@@ -76,8 +76,10 @@ export const ChartControls = ({
     chartConfig,
     dashboardFilters,
   });
+
   return (
     <Box
+      {...DISABLE_SCREENSHOT_ATTR}
       sx={{
         display: "grid",
         gridTemplateAreas: `
diff --git a/app/components/metadata-panel.tsx b/app/components/metadata-panel.tsx
index cd1800648..a0fa0be3d 100644
--- a/app/components/metadata-panel.tsx
+++ b/app/components/metadata-panel.tsx
@@ -80,7 +80,6 @@ import { assert } from "@/utils/assert";
 import { useEventEmitter } from "@/utils/eventEmitter";
 import { makeDimensionValueSorters } from "@/utils/sorting-values";
 import useEvent from "@/utils/use-event";
-import { DISABLE_SCREENSHOT_ATTR } from "@/utils/use-screenshot";
 
 import Flex from "./flex";
 import { JoinByChip } from "./JoinByChip";
@@ -371,7 +370,6 @@ const ToggleButton = ({ onClick }: { onClick: () => void }) => {
       color="primary"
       size="small"
       onClick={onClick}
-      {...DISABLE_SCREENSHOT_ATTR}
     >
       <Typography variant="body2">
         <Trans id="controls.metadata-panel.metadata">Details</Trans>