diff --git a/frontend/lib/src/components/elements/GraphVizChart/GraphVizChart.tsx b/frontend/lib/src/components/elements/GraphVizChart/GraphVizChart.tsx
index af47c3d97d8..57d2ede79cd 100644
--- a/frontend/lib/src/components/elements/GraphVizChart/GraphVizChart.tsx
+++ b/frontend/lib/src/components/elements/GraphVizChart/GraphVizChart.tsx
@@ -25,96 +25,50 @@ import { StyledGraphVizChart } from "./styled-components"
 export interface GraphVizChartProps {
   width: number
   element: GraphVizChartProto
-  height?: number
+  isFullScreen: boolean
 }
 
-interface Dimensions {
-  chartWidth: number
-  chartHeight: number
-}
-
-// Use d3Graphviz in a dummy expression so the library actually gets loaded.
-// This way it registers itself in d3 as a plugin at this point.
-const dummyGraphviz = graphviz
-dummyGraphviz // eslint-disable-line @typescript-eslint/no-unused-expressions
-
 export function GraphVizChart({
-  width: propWidth,
+  width,
   element,
-  height: propHeight,
+  isFullScreen,
 }: GraphVizChartProps): ReactElement {
   const chartId = `graphviz-chart-${element.elementId}`
 
-  let originalHeight = 0
-  let originalWidth = 0
-
-  const getChartData = (): string => {
-    return element.spec
-  }
-
-  const getChartDimensions = (): Dimensions => {
-    let chartWidth = originalWidth
-    let chartHeight = originalHeight
-
-    if (propHeight) {
-      // fullscreen
-      chartWidth = propWidth
-      chartHeight = propHeight
-    } else if (element.useContainerWidth) {
-      chartWidth = propWidth
-    }
-    return { chartWidth, chartHeight }
-  }
-
-  const updateChart = (): void => {
+  useEffect(() => {
     try {
-      // Layout and render the graph
-      const graph = graphviz(`#${chartId}`)
+      graphviz(`#${chartId}`)
         .zoom(false)
         .fit(true)
         .scale(1)
         .engine(element.engine as Engine)
-        .renderDot(getChartData())
-        .on("end", () => {
-          const node = select(`#${chartId} > svg`).node() as SVGGraphicsElement
-          if (node) {
-            originalHeight = node.getBBox().height
-            originalWidth = node.getBBox().width
-          }
-        })
+        .renderDot(element.spec)
 
-      const { chartHeight, chartWidth } = getChartDimensions()
-      if (chartHeight > 0) {
-        // Override or reset the graph height
-        graph.height(chartHeight)
-      }
-      if (chartWidth > 0) {
-        // Override or reset the graph width
-        graph.width(chartWidth)
+      if (isFullScreen || element.useContainerWidth) {
+        const node = select(`#${chartId} > svg`).node() as SVGGraphicsElement
+        // We explicitly remove width and height to let CSS and the SVG viewBox
+        // define its dimensions
+        node.removeAttribute("width")
+        node.removeAttribute("height")
       }
     } catch (error) {
       logError(error)
     }
-  }
-
-  useEffect(() => {
-    updateChart()
-  })
-
-  const elementDimensions = getChartDimensions()
-  const width: number = elementDimensions.chartWidth
-    ? elementDimensions.chartWidth
-    : propWidth
-  const height: number | undefined = elementDimensions.chartHeight
-    ? elementDimensions.chartHeight
-    : propHeight
+  }, [
+    chartId,
+    element.engine,
+    element.spec,
+    element.useContainerWidth,
+    width,
+    isFullScreen,
+  ])
 
   return (
     <StyledGraphVizChart
       className="graphviz stGraphVizChart"
       data-testid="stGraphVizChart"
       id={chartId}
-      style={{ width, height }}
+      isFullScreen={isFullScreen}
     />
   )
 }
diff --git a/frontend/lib/src/components/elements/GraphVizChart/styled-components.ts b/frontend/lib/src/components/elements/GraphVizChart/styled-components.ts
index b4da5f00c87..9b1ab8e2a20 100644
--- a/frontend/lib/src/components/elements/GraphVizChart/styled-components.ts
+++ b/frontend/lib/src/components/elements/GraphVizChart/styled-components.ts
@@ -16,15 +16,27 @@
 
 import styled from "@emotion/styled"
 
-export const StyledGraphVizChart = styled.div(({ theme }) => ({
-  "& *": {
-    fontFamily: theme.genericFonts.bodyFont,
-    // Font sizes inside the SVG element are getting huge for some reason.
-    // Hacking together a number by eyeballing it:
-    // 12px in the SVG looks like 1rem outside, so 9.6px ~= 0.8rem.
-    fontSize: "9.6px",
-  },
-  "& svg": {
-    maxWidth: "100%",
-  },
-}))
+interface StyledGraphVizChartProps {
+  isFullScreen: boolean
+}
+
+export const StyledGraphVizChart = styled.div<StyledGraphVizChartProps>(
+  ({ theme, isFullScreen }) => ({
+    "& *": {
+      fontFamily: theme.genericFonts.bodyFont,
+      // Font sizes inside the SVG element are getting huge for some reason.
+      // Hacking together a number by eyeballing it:
+      // 12px in the SVG looks like 1rem outside, so 9.6px ~= 0.8rem.
+      fontSize: "9.6px",
+    },
+
+    // Ensure SVG is allowed the full width/height in full screen mode
+    "& svg": {
+      maxWidth: "100%",
+      width: isFullScreen ? "100%" : "auto",
+      height: isFullScreen ? "100%" : "auto",
+    },
+    width: isFullScreen ? "100%" : "auto",
+    height: isFullScreen ? "100%" : "auto",
+  })
+)