diff --git a/webview-ui/src/components/common/MermaidBlock.tsx b/webview-ui/src/components/common/MermaidBlock.tsx
index 5c7919359e..7c0a55ec72 100644
--- a/webview-ui/src/components/common/MermaidBlock.tsx
+++ b/webview-ui/src/components/common/MermaidBlock.tsx
@@ -2,18 +2,27 @@ import { useEffect, useRef, useState } from "react"
 import mermaid from "mermaid"
 import { useDebounceEffect } from "../../utils/useDebounceEffect"
 import styled from "styled-components"
+import { vscode } from "../../utils/vscode"
+
+const MERMAID_THEME = {
+	background: "#1e1e1e",
+	textColor: "#ffffff",
+	mainBkg: "#2d2d2d",
+	lineColor: "#cccccc",
+	primaryColor: "#3c3c3c",
+}
 
 mermaid.initialize({
 	startOnLoad: false,
 	securityLevel: "loose",
 	theme: "dark",
 	themeVariables: {
-		background: "#1e1e1e",
-		textColor: "#ffffff", // make text much brighter
-		mainBkg: "#2d2d2d",
-		lineColor: "#cccccc", // light enough for contrast
+		background: MERMAID_THEME.background,
+		textColor: MERMAID_THEME.textColor,
+		mainBkg: MERMAID_THEME.mainBkg,
+		lineColor: MERMAID_THEME.lineColor,
 		fontSize: "16px",
-		primaryColor: "#3c3c3c", // node fill color, etc.
+		primaryColor: MERMAID_THEME.primaryColor,
 	},
 })
 
@@ -62,6 +71,26 @@ export default function MermaidBlock({ code }: MermaidBlockProps) {
 		[code], // Dependencies for scheduling
 	)
 
+	/**
+	 * Called when user clicks the rendered diagram.
+	 * Converts the <svg> to a PNG and sends it to the extension.
+	 */
+	const handleClick = async () => {
+		if (!containerRef.current) return
+		const svgEl = containerRef.current.querySelector("svg")
+		if (!svgEl) return
+
+		try {
+			const pngDataUrl = await svgToPng(svgEl)
+			vscode.postMessage({
+				type: "openImage",
+				text: pngDataUrl,
+			})
+		} catch (err) {
+			console.error("Error converting SVG to PNG:", err)
+		}
+	}
+
 	return (
 		<MermaidBlockContainer>
 			{isLoading && <LoadingMessage>Creating mermaid chart...</LoadingMessage>}
@@ -72,6 +101,58 @@ export default function MermaidBlock({ code }: MermaidBlockProps) {
 	)
 }
 
+async function svgToPng(svgEl: SVGElement): Promise<string> {
+	console.log("svgToPng function called")
+	// Clone the SVG to avoid modifying the original
+	const svgClone = svgEl.cloneNode(true) as SVGElement
+
+	// Get the original viewBox
+	const viewBox = svgClone.getAttribute("viewBox")?.split(" ").map(Number) || []
+	const originalWidth = viewBox[2] || svgClone.clientWidth
+	const originalHeight = viewBox[3] || svgClone.clientHeight
+
+	// Calculate the scale factor to fit editor width while maintaining aspect ratio
+
+	// Unless we can find a way to get the actual editor window dimensions through the VS Code API (which might be possible but would require changes to the extension side),
+	// the fixed 1200px width seems like a reliable approach.
+	const editorWidth = 1200
+
+	const scale = editorWidth / originalWidth
+	const scaledHeight = originalHeight * scale
+
+	// Update SVG dimensions
+	svgClone.setAttribute("width", `${editorWidth}`)
+	svgClone.setAttribute("height", `${scaledHeight}`)
+
+	const serializer = new XMLSerializer()
+	const svgString = serializer.serializeToString(svgClone)
+	const svgDataUrl = "data:image/svg+xml;base64," + btoa(decodeURIComponent(encodeURIComponent(svgString)))
+
+	return new Promise((resolve, reject) => {
+		const img = new Image()
+		img.onload = () => {
+			const canvas = document.createElement("canvas")
+			canvas.width = editorWidth
+			canvas.height = scaledHeight
+
+			const ctx = canvas.getContext("2d")
+			if (!ctx) return reject("Canvas context not available")
+
+			// Fill background with Mermaid's dark theme background color
+			ctx.fillStyle = MERMAID_THEME.background
+			ctx.fillRect(0, 0, canvas.width, canvas.height)
+
+			ctx.imageSmoothingEnabled = true
+			ctx.imageSmoothingQuality = "high"
+
+			ctx.drawImage(img, 0, 0, editorWidth, scaledHeight)
+			resolve(canvas.toDataURL("image/png", 1.0))
+		}
+		img.onerror = reject
+		img.src = svgDataUrl
+	})
+}
+
 const MermaidBlockContainer = styled.div`
 	position: relative;
 	margin: 8px 0;