diff --git a/web/src/components/Layout.tsx b/web/src/components/Layout.tsx
index c9b3bca..5dd0d25 100644
--- a/web/src/components/Layout.tsx
+++ b/web/src/components/Layout.tsx
@@ -120,7 +120,7 @@ export function Layout() {
         <div className="flex-1 flex min-h-0">
           <div className="flex flex-col items-center w-16 bg-gb-bg-h border-r border-gb-bg-t py-2 gap-2 shrink-0">
             <button
-              onClick={() => setDM(false)}
+              onClick={() => { setDM(false); navigate('/'); }}
               className={`w-11 h-11 flex items-center justify-center font-mono text-xs border rounded ${
                 !isDM
                   ? 'bg-gb-bg-t text-gb-orange border-gb-orange'
@@ -134,6 +134,7 @@ export function Layout() {
               onClick={() => {
                 setDM(true);
                 setActiveServer(null);
+                navigate('/dm');
               }}
               className={`w-11 h-11 flex items-center justify-center font-mono text-xs border rounded ${
                 isDM