diff --git a/crates/relune-app/tests/snapshots/fixture_render_audit__fixture_render_audit__cyclic_fk.snap b/crates/relune-app/tests/snapshots/fixture_render_audit__fixture_render_audit__cyclic_fk.snap
index c994e82..6691c26 100644
--- a/crates/relune-app/tests/snapshots/fixture_render_audit__fixture_render_audit__cyclic_fk.snap
+++ b/crates/relune-app/tests/snapshots/fixture_render_audit__fixture_render_audit__cyclic_fk.snap
@@ -53,7 +53,7 @@ expression: "fixture_audit_snapshot(\"cyclic_fk.sql\")"
   },
   "surfaces": {
     "html": {
-      "bytes": 453018,
+      "bytes": 456843,
       "contains_embedded_svg": true,
       "contains_metadata": true,
       "contains_viewport": true
diff --git a/crates/relune-app/tests/snapshots/fixture_render_audit__fixture_render_audit__ecommerce.snap b/crates/relune-app/tests/snapshots/fixture_render_audit__fixture_render_audit__ecommerce.snap
index 2af19a0..3811151 100644
--- a/crates/relune-app/tests/snapshots/fixture_render_audit__fixture_render_audit__ecommerce.snap
+++ b/crates/relune-app/tests/snapshots/fixture_render_audit__fixture_render_audit__ecommerce.snap
@@ -49,7 +49,7 @@ expression: "fixture_audit_snapshot(\"ecommerce.sql\")"
   },
   "surfaces": {
     "html": {
-      "bytes": 426912,
+      "bytes": 430737,
       "contains_embedded_svg": true,
       "contains_metadata": true,
       "contains_viewport": true
diff --git a/crates/relune-app/tests/snapshots/fixture_render_audit__fixture_render_audit__join_heavy.snap b/crates/relune-app/tests/snapshots/fixture_render_audit__fixture_render_audit__join_heavy.snap
index 881951d..1381ef7 100644
--- a/crates/relune-app/tests/snapshots/fixture_render_audit__fixture_render_audit__join_heavy.snap
+++ b/crates/relune-app/tests/snapshots/fixture_render_audit__fixture_render_audit__join_heavy.snap
@@ -53,7 +53,7 @@ expression: "fixture_audit_snapshot(\"join_heavy.sql\")"
   },
   "surfaces": {
     "html": {
-      "bytes": 608344,
+      "bytes": 612169,
       "contains_embedded_svg": true,
       "contains_metadata": true,
       "contains_viewport": true
diff --git a/crates/relune-app/tests/snapshots/fixture_render_audit__fixture_render_audit__multi_schema.snap b/crates/relune-app/tests/snapshots/fixture_render_audit__fixture_render_audit__multi_schema.snap
index a2ec6a8..ed12f86 100644
--- a/crates/relune-app/tests/snapshots/fixture_render_audit__fixture_render_audit__multi_schema.snap
+++ b/crates/relune-app/tests/snapshots/fixture_render_audit__fixture_render_audit__multi_schema.snap
@@ -47,7 +47,7 @@ expression: "fixture_audit_snapshot(\"multi_schema.sql\")"
   },
   "surfaces": {
     "html": {
-      "bytes": 419939,
+      "bytes": 423764,
       "contains_embedded_svg": true,
       "contains_metadata": true,
       "contains_viewport": true
diff --git a/crates/relune-app/tests/snapshots/fixture_render_audit__fixture_render_audit__simple_blog.snap b/crates/relune-app/tests/snapshots/fixture_render_audit__fixture_render_audit__simple_blog.snap
index 18f5523..1733f91 100644
--- a/crates/relune-app/tests/snapshots/fixture_render_audit__fixture_render_audit__simple_blog.snap
+++ b/crates/relune-app/tests/snapshots/fixture_render_audit__fixture_render_audit__simple_blog.snap
@@ -47,7 +47,7 @@ expression: "fixture_audit_snapshot(\"simple_blog.sql\")"
   },
   "surfaces": {
     "html": {
-      "bytes": 380109,
+      "bytes": 383934,
       "contains_embedded_svg": true,
       "contains_metadata": true,
       "contains_viewport": true
diff --git a/crates/relune-render-html/src/components.rs b/crates/relune-render-html/src/components.rs
index 2168c87..c2b3283 100644
--- a/crates/relune-render-html/src/components.rs
+++ b/crates/relune-render-html/src/components.rs
@@ -87,8 +87,9 @@ pub(crate) fn build_viewer_controls_html() -> String {
     <button type="button" class="viewer-control-button" id="zoom-out" title="Zoom out"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round"><path d="M5 12h14"/></svg></button>
     <span class="viewer-control-status" id="zoom-level">100%</span>
     <button type="button" class="viewer-control-button viewer-control-fit" id="zoom-fit" title="Fit to screen"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M15 3h6v6M9 21H3v-6M21 3l-7 7M3 21l7-7"/></svg></button>
+    <button type="button" class="viewer-control-button viewer-control-minimap" id="minimap-toggle" aria-pressed="false" aria-label="Minimap" aria-controls="minimap-shell" aria-keyshortcuts="M" title="Show minimap (M)"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M3 6l6-2 6 2 6-2v14l-6 2-6-2-6 2z"/><path d="M9 4v16M15 6v16"/></svg></button>
   </div>
-  <div class="minimap-shell" id="minimap-shell" aria-label="Diagram minimap">
+  <div class="minimap-shell" id="minimap-shell" aria-label="Diagram minimap" hidden>
     <div class="minimap-header">
       <span>Minimap</span>
       <span class="minimap-hint">Viewport</span>
diff --git a/crates/relune-render-html/src/css.rs b/crates/relune-render-html/src/css.rs
index a7508eb..b67bf81 100644
--- a/crates/relune-render-html/src/css.rs
+++ b/crates/relune-render-html/src/css.rs
@@ -982,6 +982,14 @@ pub(crate) fn build_css(
       background: color-mix(in srgb, var(--panel-bg) 82%, var(--accent-soft));
     }
 
+    .viewer-control-button[aria-pressed=false] {
+      opacity: 0.55;
+    }
+
+    .viewer-control-button[aria-pressed=false]:hover {
+      opacity: 1;
+    }
+
     .minimap-shell {
       position: fixed;
       right: 12px;
diff --git a/crates/relune-render-html/src/html.rs b/crates/relune-render-html/src/html.rs
index 4c7c72c..3cf64e4 100644
--- a/crates/relune-render-html/src/html.rs
+++ b/crates/relune-render-html/src/html.rs
@@ -585,6 +585,14 @@ mod tests {
         assert!(html.contains(r#"id="zoom-out""#));
         assert!(html.contains(r#"id="zoom-level""#));
         assert!(html.contains(r#"id="zoom-fit""#));
+        assert!(html.contains(r#"id="minimap-toggle""#));
+        assert!(html.contains(r#"aria-pressed="false""#));
+        assert!(html.contains(r#"aria-label="Minimap""#));
+        assert!(html.contains(r#"aria-controls="minimap-shell""#));
+        assert!(html.contains(r#"aria-keyshortcuts="M""#));
+        assert!(html.contains(r#"title="Show minimap (M)""#));
+        assert!(html.contains(r#"id="minimap-shell""#));
+        assert!(html.contains(r#"id="minimap-shell" aria-label="Diagram minimap" hidden"#));
         assert!(html.contains(r#"id="minimap""#));
         // Verify SVG icons replaced text labels
         assert!(html.contains("<svg"));
diff --git a/crates/relune-render-html/src/js/minimap.js b/crates/relune-render-html/src/js/minimap.js
index e220fbc..b699cfa 100644
--- a/crates/relune-render-html/src/js/minimap.js
+++ b/crates/relune-render-html/src/js/minimap.js
@@ -2,6 +2,8 @@
 (() => {
   // ts/viewer_api.ts
   var VIEWER_RUNTIME_KEY = /* @__PURE__ */ Symbol.for("relune.viewer.runtime");
+  var VIEWER_READY_MODULES_KEY = /* @__PURE__ */ Symbol.for("relune.viewer.ready_modules");
+  var VIEWER_WAITERS_KEY = /* @__PURE__ */ Symbol.for("relune.viewer.waiters");
   function getViewerRuntime() {
     const viewerWindow = window;
     if (viewerWindow[VIEWER_RUNTIME_KEY] === void 0) {
@@ -9,9 +11,73 @@
     }
     return viewerWindow[VIEWER_RUNTIME_KEY];
   }
+  function readyModules() {
+    const viewerWindow = window;
+    if (viewerWindow[VIEWER_READY_MODULES_KEY] === void 0) {
+      viewerWindow[VIEWER_READY_MODULES_KEY] = /* @__PURE__ */ new Set();
+    }
+    return viewerWindow[VIEWER_READY_MODULES_KEY];
+  }
+  function runtimeWaiters() {
+    const viewerWindow = window;
+    if (viewerWindow[VIEWER_WAITERS_KEY] === void 0) {
+      viewerWindow[VIEWER_WAITERS_KEY] = [];
+    }
+    return viewerWindow[VIEWER_WAITERS_KEY];
+  }
+  function markViewerModuleReady(module) {
+    readyModules().add(module);
+    flushViewerWaiters();
+  }
+  function flushViewerWaiters() {
+    const ready = readyModules();
+    const remaining = [];
+    for (const waiter of runtimeWaiters()) {
+      if (Array.from(waiter.modules).every((module) => ready.has(module))) {
+        waiter.callback();
+      } else {
+        remaining.push(waiter);
+      }
+    }
+    const viewerWindow = window;
+    viewerWindow[VIEWER_WAITERS_KEY] = remaining;
+  }
+  function emitViewerEvent(name, detail) {
+    document.dispatchEvent(new CustomEvent(name, { detail }));
+  }
 
   // ts/minimap.ts
   {
+    const runtime = getViewerRuntime();
+    const minimapShell = document.getElementById("minimap-shell");
+    const minimapToggleBtn = document.getElementById("minimap-toggle");
+    if (minimapShell instanceof HTMLElement) {
+      const isHidden = () => minimapShell.hasAttribute("hidden");
+      const setHidden = (hidden, options) => {
+        const changed = isHidden() !== hidden;
+        if (hidden) {
+          minimapShell.setAttribute("hidden", "");
+        } else {
+          minimapShell.removeAttribute("hidden");
+        }
+        if (minimapToggleBtn instanceof HTMLButtonElement) {
+          minimapToggleBtn.setAttribute("aria-pressed", String(!hidden));
+          const action = hidden ? "Show minimap" : "Hide minimap";
+          minimapToggleBtn.setAttribute("title", `${action} (M)`);
+        }
+        if (changed && options?.silent !== true) {
+          emitViewerEvent("relune:minimap-toggled", { hidden });
+        }
+      };
+      runtime.minimap = { isHidden, setHidden };
+      markViewerModuleReady("minimap");
+      if (minimapToggleBtn instanceof HTMLButtonElement) {
+        minimapToggleBtn.addEventListener("click", () => {
+          setHidden(!isHidden());
+          runtime.viewport?.fit();
+        });
+      }
+    }
     const host = document.getElementById("minimap");
     const svgRoot = document.querySelector(".canvas svg");
     if (!(host instanceof SVGSVGElement) || svgRoot === null) {
@@ -37,7 +103,6 @@
         runtime.viewport?.center(contentX, contentY);
       };
       updateFrame2 = updateFrame, focusPoint2 = focusPoint;
-      const runtime = getViewerRuntime();
       const hostSvg = host;
       hostSvg.innerHTML = "";
       const frame = document.createElementNS("http://www.w3.org/2000/svg", "rect");
diff --git a/crates/relune-render-html/src/js/pan_zoom.js b/crates/relune-render-html/src/js/pan_zoom.js
index 7f492d4..301af66 100644
--- a/crates/relune-render-html/src/js/pan_zoom.js
+++ b/crates/relune-render-html/src/js/pan_zoom.js
@@ -93,7 +93,7 @@
     if (diagram.width <= 0 || diagram.height <= 0 || available.width <= 0 || available.height <= 0) {
       return null;
     }
-    const padding = 40;
+    const padding = 20;
     const scale = clamp(
       Math.min(
         (available.width - padding * 2) / diagram.width,
diff --git a/crates/relune-render-html/src/js/shortcuts.js b/crates/relune-render-html/src/js/shortcuts.js
index f065efc..6910d00 100644
--- a/crates/relune-render-html/src/js/shortcuts.js
+++ b/crates/relune-render-html/src/js/shortcuts.js
@@ -46,6 +46,17 @@
           event.preventDefault();
           document.getElementById("group-panel-collapse")?.dispatchEvent(new MouseEvent("click"));
           break;
+        case "m":
+        case "M":
+          if (event.ctrlKey || event.metaKey || event.altKey) {
+            break;
+          }
+          event.preventDefault();
+          if (runtime.minimap !== void 0) {
+            runtime.minimap.setHidden(!runtime.minimap.isHidden());
+            runtime.viewport?.fit();
+          }
+          break;
         case "+":
         case "=":
           event.preventDefault();
diff --git a/crates/relune-render-html/src/js/url_state.js b/crates/relune-render-html/src/js/url_state.js
index eef404f..db3c6be 100644
--- a/crates/relune-render-html/src/js/url_state.js
+++ b/crates/relune-render-html/src/js/url_state.js
@@ -124,6 +124,9 @@
       if (collapsed.length > 0) {
         params.set(PARAM_COLLAPSED, collapsed.join(","));
       }
+      if (runtime.minimap?.isHidden() === false) {
+        params.set(PARAM_MINIMAP_VISIBLE, "1");
+      }
       return params;
     }, writeHash = function() {
       const str = buildHashParams().toString();
@@ -142,6 +145,7 @@
       pendingPush = false;
     }, restoreFromHash = function() {
       const params = readHash();
+      runtime.minimap?.setHidden(params.get(PARAM_MINIMAP_VISIBLE) !== "1", { silent: true });
       if (params.toString() === "") {
         return;
       }
@@ -211,6 +215,9 @@
       if (document.getElementById("canvas")?.querySelector("svg") !== null) {
         modules.push("collapse");
       }
+      if (document.getElementById("minimap-shell") !== null) {
+        modules.push("minimap");
+      }
       return modules;
     };
     readHash2 = readHash, maxViewportPanMagnitude2 = maxViewportPanMagnitude, hasValidViewportState2 = hasValidViewportState, matchesMetadataSearch2 = matchesMetadataSearch, hasMetadataSearchMatch2 = hasMetadataSearchMatch, scheduleWrite2 = scheduleWrite, scheduleDiscreteWrite2 = scheduleDiscreteWrite, buildHashParams2 = buildHashParams, writeHash2 = writeHash, restoreFromHash2 = restoreFromHash, expectedViewerModules2 = expectedViewerModules;
@@ -231,6 +238,7 @@
     const PARAM_FILTER_MODE = "fm";
     const PARAM_HIDDEN_GROUPS = "hg";
     const PARAM_COLLAPSED = "c";
+    const PARAM_MINIMAP_VISIBLE = "mv";
     const FACET_PARAMS = [
       { param: PARAM_FILTER_SCHEMA, facetId: "schema" },
       { param: PARAM_FILTER_KIND, facetId: "kind" },
@@ -251,6 +259,7 @@
     document.addEventListener("relune:filters-changed", scheduleDiscreteWrite);
     document.addEventListener("relune:groups-changed", scheduleDiscreteWrite);
     document.addEventListener("relune:collapse-changed", scheduleDiscreteWrite);
+    document.addEventListener("relune:minimap-toggled", scheduleDiscreteWrite);
     window.addEventListener("popstate", () => {
       restoringFromPopstate = true;
       restoreFromHash();
diff --git a/crates/relune-render-html/ts/minimap.ts b/crates/relune-render-html/ts/minimap.ts
index 73ce765..35cedc3 100644
--- a/crates/relune-render-html/ts/minimap.ts
+++ b/crates/relune-render-html/ts/minimap.ts
@@ -1,4 +1,10 @@
-import { getViewerRuntime, type DiagramBounds, type ViewportState } from './viewer_api';
+import {
+  emitViewerEvent,
+  getViewerRuntime,
+  markViewerModuleReady,
+  type DiagramBounds,
+  type ViewportState,
+} from './viewer_api';
 
 interface MinimapNode {
   id: string;
@@ -9,12 +15,44 @@ interface MinimapNode {
 }
 
 {
+  const runtime = getViewerRuntime();
+  const minimapShell = document.getElementById('minimap-shell');
+  const minimapToggleBtn = document.getElementById('minimap-toggle');
+
+  if (minimapShell instanceof HTMLElement) {
+    const isHidden = (): boolean => minimapShell.hasAttribute('hidden');
+    const setHidden = (hidden: boolean, options?: { silent?: boolean }): void => {
+      const changed = isHidden() !== hidden;
+      if (hidden) {
+        minimapShell.setAttribute('hidden', '');
+      } else {
+        minimapShell.removeAttribute('hidden');
+      }
+      if (minimapToggleBtn instanceof HTMLButtonElement) {
+        minimapToggleBtn.setAttribute('aria-pressed', String(!hidden));
+        const action = hidden ? 'Show minimap' : 'Hide minimap';
+        minimapToggleBtn.setAttribute('title', `${action} (M)`);
+      }
+      if (changed && options?.silent !== true) {
+        emitViewerEvent('relune:minimap-toggled', { hidden });
+      }
+    };
+    runtime.minimap = { isHidden, setHidden };
+    markViewerModuleReady('minimap');
+
+    if (minimapToggleBtn instanceof HTMLButtonElement) {
+      minimapToggleBtn.addEventListener('click', () => {
+        setHidden(!isHidden());
+        runtime.viewport?.fit();
+      });
+    }
+  }
+
   const host = document.getElementById('minimap');
   const svgRoot = document.querySelector('.canvas svg');
   if (!(host instanceof SVGSVGElement) || svgRoot === null) {
     // Minimap host or source SVG not available.
   } else {
-    const runtime = getViewerRuntime();
     const hostSvg = host;
     hostSvg.innerHTML = '';
 
diff --git a/crates/relune-render-html/ts/pan_zoom_state.ts b/crates/relune-render-html/ts/pan_zoom_state.ts
index 77dc176..464f95d 100644
--- a/crates/relune-render-html/ts/pan_zoom_state.ts
+++ b/crates/relune-render-html/ts/pan_zoom_state.ts
@@ -69,7 +69,7 @@ export function computeFit(
     return null;
   }
 
-  const padding = 40;
+  const padding = 20;
   const scale = clamp(
     Math.min(
       (available.width - padding * 2) / diagram.width,
diff --git a/crates/relune-render-html/ts/shortcuts.ts b/crates/relune-render-html/ts/shortcuts.ts
index 7fd7ab8..322fda2 100644
--- a/crates/relune-render-html/ts/shortcuts.ts
+++ b/crates/relune-render-html/ts/shortcuts.ts
@@ -31,6 +31,19 @@ import { getViewerRuntime, isEditableTarget } from './viewer_api';
         event.preventDefault();
         document.getElementById('group-panel-collapse')?.dispatchEvent(new MouseEvent('click'));
         break;
+      case 'm':
+      case 'M':
+        // Skip when a modifier is held (Cmd+M, Ctrl+M, Alt+M) so we don't
+        // shadow OS- or browser-owned shortcuts.
+        if (event.ctrlKey || event.metaKey || event.altKey) {
+          break;
+        }
+        event.preventDefault();
+        if (runtime.minimap !== undefined) {
+          runtime.minimap.setHidden(!runtime.minimap.isHidden());
+          runtime.viewport?.fit();
+        }
+        break;
       case '+':
       case '=':
         event.preventDefault();
diff --git a/crates/relune-render-html/ts/url_state.ts b/crates/relune-render-html/ts/url_state.ts
index 4c44e3a..dbdf43f 100644
--- a/crates/relune-render-html/ts/url_state.ts
+++ b/crates/relune-render-html/ts/url_state.ts
@@ -20,6 +20,7 @@ import { getViewerRuntime, waitForViewerModules, type ViewerModule } from './vie
   const PARAM_FILTER_MODE = 'fm';
   const PARAM_HIDDEN_GROUPS = 'hg';
   const PARAM_COLLAPSED = 'c';
+  const PARAM_MINIMAP_VISIBLE = 'mv';
 
   type FacetUrlParam = { param: string; facetId: string };
   const FACET_PARAMS: FacetUrlParam[] = [
@@ -147,6 +148,10 @@ import { getViewerRuntime, waitForViewerModules, type ViewerModule } from './vie
       params.set(PARAM_COLLAPSED, collapsed.join(','));
     }
 
+    if (runtime.minimap?.isHidden() === false) {
+      params.set(PARAM_MINIMAP_VISIBLE, '1');
+    }
+
     return params;
   }
 
@@ -174,6 +179,12 @@ import { getViewerRuntime, waitForViewerModules, type ViewerModule } from './vie
 
   function restoreFromHash(): void {
     const params = readHash();
+    // Sync minimap visibility unconditionally so popstate back to a clean hash
+    // restores the hidden default instead of leaving it stuck visible. Use the
+    // silent option to avoid emitting `relune:minimap-toggled` — that event
+    // would queue a debounced hash write after restoringFromPopstate has
+    // already flipped back to false, causing a spurious pushState.
+    runtime.minimap?.setHidden(params.get(PARAM_MINIMAP_VISIBLE) !== '1', { silent: true });
     if (params.toString() === '') {
       return;
     }
@@ -259,6 +270,9 @@ import { getViewerRuntime, waitForViewerModules, type ViewerModule } from './vie
     if (document.getElementById('canvas')?.querySelector('svg') !== null) {
       modules.push('collapse');
     }
+    if (document.getElementById('minimap-shell') !== null) {
+      modules.push('minimap');
+    }
     return modules;
   }
 
@@ -273,6 +287,7 @@ import { getViewerRuntime, waitForViewerModules, type ViewerModule } from './vie
   document.addEventListener('relune:filters-changed', scheduleDiscreteWrite);
   document.addEventListener('relune:groups-changed', scheduleDiscreteWrite);
   document.addEventListener('relune:collapse-changed', scheduleDiscreteWrite);
+  document.addEventListener('relune:minimap-toggled', scheduleDiscreteWrite);
 
   // ---------------------------------------------------------------------------
   // popstate: re-apply state when the user navigates back/forward or edits hash
diff --git a/crates/relune-render-html/ts/viewer_api.ts b/crates/relune-render-html/ts/viewer_api.ts
index 99a62cc..e67fbc0 100644
--- a/crates/relune-render-html/ts/viewer_api.ts
+++ b/crates/relune-render-html/ts/viewer_api.ts
@@ -63,6 +63,11 @@ export interface ViewerCollapseApi {
   setCollapsed(tableIds: string[]): void;
 }
 
+export interface ViewerMinimapApi {
+  isHidden(): boolean;
+  setHidden(hidden: boolean, options?: { silent?: boolean }): void;
+}
+
 export interface ViewerRuntime {
   viewport?: ViewerViewportApi;
   filters?: ViewerFiltersApi;
@@ -70,9 +75,17 @@ export interface ViewerRuntime {
   selection?: ViewerSelectionApi;
   groups?: ViewerGroupsApi;
   collapse?: ViewerCollapseApi;
+  minimap?: ViewerMinimapApi;
 }
 
-export type ViewerModule = 'viewport' | 'filters' | 'search' | 'selection' | 'groups' | 'collapse';
+export type ViewerModule =
+  | 'viewport'
+  | 'filters'
+  | 'search'
+  | 'selection'
+  | 'groups'
+  | 'collapse'
+  | 'minimap';
 
 type RuntimeWaiter = {
   modules: Set<ViewerModule>;