diff --git a/src/apps/officer-web/Screens/Dashboard/Layout/DashboardLayout.tsx b/src/apps/officer-web/Screens/Dashboard/Layout/DashboardLayout.tsx
index 7d59a627..150cda6e 100644
--- a/src/apps/officer-web/Screens/Dashboard/Layout/DashboardLayout.tsx
+++ b/src/apps/officer-web/Screens/Dashboard/Layout/DashboardLayout.tsx
@@ -1,3 +1,4 @@
+import { useRef } from 'react';
 import { useDock, MusicPlayerHost } from 'officerdev';
 import { Background } from './Background';
 import { Header } from './Header';
@@ -12,20 +13,19 @@ export function DashboardLayout({ children }: DashboardLayoutProps) {
   const { items: visibleItems } = useDock(ALL_DOCK_ITEMS, DEFAULT_DOCK_PATHS);
   const isTouch = useIsTouch();
   usePageTitleSync();
+  // The content region shrinks when the (in-flow) music dock takes its space; the nav dock measures its
+  // reveal boundary from this element, so it always sits just above whatever's at the bottom.
+  const regionRef = useRef<HTMLElement | null>(null);
 
   return (
-    <div className="relative overflow-hidden h-dvh outline-none inset-0">
+    <div className="relative flex h-dvh flex-col overflow-hidden outline-none inset-0">
       <Header dockItems={visibleItems} />
-      <section className="relative h-dvh snap-start overflow-hidden">
+      <section ref={regionRef} className="relative min-h-0 flex-1 snap-start overflow-hidden">
         <Background />
-        {!isTouch && <Dock items={visibleItems} className="hidden md:flex" />}
-        <div className="absolute inset-0 z-2 pt-[52px] md:pt-[64px] pb-2 overflow-y-auto">
-          {children}
-        </div>
+        {!isTouch && <Dock items={visibleItems} boundaryRef={regionRef} className="hidden md:flex" />}
+        <div className="absolute inset-0 z-2 pt-[52px] md:pt-[64px] pb-2 overflow-y-auto">{children}</div>
       </section>
       <MusicPlayerHost />
     </div>
   );
-};
-
-
+}
diff --git a/src/apps/officer-web/Screens/Dashboard/Layout/Dock.tsx b/src/apps/officer-web/Screens/Dashboard/Layout/Dock.tsx
index 8aebb6bc..7205d8e6 100644
--- a/src/apps/officer-web/Screens/Dashboard/Layout/Dock.tsx
+++ b/src/apps/officer-web/Screens/Dashboard/Layout/Dock.tsx
@@ -1,7 +1,6 @@
 import { useEffect, useRef, useState } from 'react';
 import { Link, useLocation } from 'react-router';
 import type { LucideIcon } from 'lucide-react';
-import { useMusicPlayer, MUSIC_DOCK_HEIGHT } from 'officerdev';
 
 export type DockItem = {
   label: string;
@@ -13,6 +12,9 @@ export type DockItem = {
 type DockProps = {
   items: DockItem[];
   className?: string;
+  // The content region the dock lives in. Reveal/hide is measured from ITS bottom edge, which the
+  // in-flow music dock shrinks when present — so the dock clears the music dock with no magic offset.
+  boundaryRef: React.RefObject<HTMLElement | null>;
 };
 
 const ICON_SIZE = 48;
@@ -30,30 +32,22 @@ const getScale = (mouseX: number | null, iconCenterX: number) => {
   return 1 + (MAX_SCALE - 1) * Math.cos((distance / MAX_DISTANCE) * (Math.PI / 2));
 };
 
-export const Dock = ({ items, className }: DockProps) => {
+export const Dock = ({ items, className, boundaryRef }: DockProps) => {
   const [mouseX, setMouseX] = useState<number | null>(null);
   const [visible, setVisible] = useState(false);
   const dockRef = useRef<HTMLDivElement | null>(null);
   const location = useLocation();
-  const { current } = useMusicPlayer();
-  const musicDockPresent = !!current;
-  // Read the latest value inside the (once-registered) mousemove handler, so it reacts to the music
-  // dock appearing/disappearing without re-binding the listener.
-  const musicPresentRef = useRef(musicDockPresent);
-  musicPresentRef.current = musicDockPresent;
 
   const isActive = (to: string) => (to === '/' ? location.pathname === '/' : location.pathname.startsWith(to));
 
   useEffect(() => {
     const handleMouseMove = (ev: MouseEvent) => {
-      const distFromBottom = window.innerHeight - ev.clientY;
-      // When the music dock is present the nav dock rides MUSIC_DOCK_HEIGHT higher, so lift the hide/
-      // magnify zone by the same amount — otherwise hovering the raised dock counts as past the hide
-      // threshold and it slides away under the cursor. The reveal trigger stays at the bottom edge.
-      const lift = musicPresentRef.current ? MUSIC_DOCK_HEIGHT : 0;
-      const hideAt = HIDE_THRESHOLD + lift;
-      setVisible((prev) => (prev ? distFromBottom <= hideAt : distFromBottom <= SHOW_THRESHOLD));
-      if (distFromBottom <= hideAt) {
+      // Distance from the bottom of the content region (which the in-flow music dock shrinks when
+      // present) — so reveal/hide triggers just above wherever the region ends, above the music dock.
+      const bottom = boundaryRef.current?.getBoundingClientRect().bottom ?? window.innerHeight;
+      const distFromBottom = bottom - ev.clientY;
+      setVisible((prev) => (prev ? distFromBottom <= HIDE_THRESHOLD : distFromBottom <= SHOW_THRESHOLD));
+      if (distFromBottom <= HIDE_THRESHOLD) {
         const rect = dockRef.current?.getBoundingClientRect();
         if (rect) setMouseX(ev.clientX - rect.left);
       } else {
@@ -63,20 +57,17 @@ export const Dock = ({ items, className }: DockProps) => {
 
     document.addEventListener('mousemove', handleMouseMove);
     return () => document.removeEventListener('mousemove', handleMouseMove);
-  }, []);
+  }, [boundaryRef]);
 
   return (
     <div
       ref={dockRef}
-      className={`fixed left-1/2 z-5 items-end gap-2 md:gap-6 px-2 py-1.5 md:px-3 md:py-2 rounded-2xl border backdrop-blur-xl shadow-lg transition-transform duration-300 ease-in-out ${className ?? 'flex'}`}
+      className={`absolute left-1/2 z-5 items-end gap-2 md:gap-6 px-2 py-1.5 md:px-3 md:py-2 rounded-2xl border backdrop-blur-xl shadow-lg transition-transform duration-300 ease-in-out ${className ?? 'flex'}`}
       style={{
         backgroundColor: 'var(--dock-bg)',
         borderColor: 'var(--dock-border)',
         bottom: '16px',
-        // Slide up over the site-wide music dock when it's present so the nav dock clears it.
-        transform: `translateX(-50%) translateY(${
-          visible ? (musicDockPresent ? `-${MUSIC_DOCK_HEIGHT}px` : '0') : 'calc(100% + 24px)'
-        })`,
+        transform: `translateX(-50%) translateY(${visible ? '0' : 'calc(100% + 24px)'})`,
       }}
     >
       {items.map((item, index) => {
diff --git a/src/workspaces/officerdev/src/MusicPlayer/MusicPlayerHost.tsx b/src/workspaces/officerdev/src/MusicPlayer/MusicPlayerHost.tsx
index 0dd75db9..04fdab45 100644
--- a/src/workspaces/officerdev/src/MusicPlayer/MusicPlayerHost.tsx
+++ b/src/workspaces/officerdev/src/MusicPlayer/MusicPlayerHost.tsx
@@ -249,8 +249,10 @@ export const MusicPlayerHost = () => {
 
   if (!current) return null;
 
+  // In-flow bottom bar (NOT position:fixed) — it reserves its own height so the content above shrinks to
+  // fit and the nav dock naturally sits above it, no overlap hacks needed.
   return (
-    <div className="fixed inset-x-0 bottom-0 z-50 flex items-center gap-3 border-t border-border bg-card/95 px-4 py-2 backdrop-blur">
+    <div className="flex shrink-0 items-center gap-3 border-t border-border bg-card/95 px-4 py-2 backdrop-blur">
       {/* cover + info — click to open this album in /music */}
       <button
         type="button"
diff --git a/src/workspaces/officerdev/src/MusicPlayer/useMusicPlayer.ts b/src/workspaces/officerdev/src/MusicPlayer/useMusicPlayer.ts
index 9b9fd61a..1666e53d 100644
--- a/src/workspaces/officerdev/src/MusicPlayer/useMusicPlayer.ts
+++ b/src/workspaces/officerdev/src/MusicPlayer/useMusicPlayer.ts
@@ -19,9 +19,6 @@ export type MusicPlayerState = {
 
 const INITIAL: MusicPlayerState = { queue: [], index: 0, playing: false };
 
-// Amount (px) the nav Dock shifts up while the music dock is present, so it clears it.
-export const MUSIC_DOCK_HEIGHT = 72;
-
 export function useMusicPlayer() {
   const [state, setState] = useGlobal<MusicPlayerState>('MUSIC_PLAYER', INITIAL);