diff --git a/frontend/src/app/DocumentsRoute.tsx b/frontend/src/app/DocumentsRoute.tsx
index 4707435..bdcdfd6 100644
--- a/frontend/src/app/DocumentsRoute.tsx
+++ b/frontend/src/app/DocumentsRoute.tsx
@@ -131,25 +131,18 @@ const DocumentsRouteContent: React.FC = () => {
   }, []);
 
   const renderSurface = () => {
-    if (!surface) {
-      return (
-        <main className={`documents-main${sidebarHidden ? ' documents-main--sidebar-hidden' : ''}`}>
-          {!sidebarHidden ? <Sidebar {...sidebarPropsWithActions} /> : null}
-          <div className="main-content">
-            <div className="main-content__body" />
-          </div>
-        </main>
-      );
-    }
+    const layoutClass = `documents-main${sidebarHidden ? ' documents-main--sidebar-hidden' : ''}`;
+    const sidebarNode = !sidebarHidden ? <Sidebar {...sidebarPropsWithActions} /> : null;
+    const surfaceDetail = surface && (surface as { detail?: ReactNode }).detail ? (surface as { detail?: ReactNode }).detail : null;
+    const surfaceBody = surface ? surface.content : null;
 
-    const surfaceDetail = (surface as { detail?: ReactNode }).detail || null;
     return (
-      <main className={`documents-main${sidebarHidden ? ' documents-main--sidebar-hidden' : ''}`}>
-        {!sidebarHidden ? <Sidebar {...sidebarPropsWithActions} /> : null}
+      <main className={layoutClass}>
+        {sidebarNode}
         <div className="main-content">
-          <div className="main-content__body">{surface.content}</div>
-          {surfaceDetail}
+          {surfaceBody}
         </div>
+        {surfaceDetail}
       </main>
     );
   };
diff --git a/frontend/src/styles/documents/listing.css b/frontend/src/styles/documents/listing.css
index e2b7aae..b881241 100644
--- a/frontend/src/styles/documents/listing.css
+++ b/frontend/src/styles/documents/listing.css
@@ -27,6 +27,10 @@
   outline-offset: -2px;
 }
 
+.documents-panel--view-desk {
+  padding: 0;
+}
+
 .documents-grid .folder-card.is-drop-target {
   outline: 2px dashed var(--accent-strong, var(--accent));
   outline-offset: 2px;
diff --git a/frontend/src/styles/layout/structure.css b/frontend/src/styles/layout/structure.css
index 18f1b39..112f57e 100644
--- a/frontend/src/styles/layout/structure.css
+++ b/frontend/src/styles/layout/structure.css
@@ -36,25 +36,8 @@
   border-left: 1px solid var(--border);
 }
 
-.main-content__body {
-  position: relative;
-  flex: 1 1 auto;
-  flex-direction: column;
-  display: flex;
-  min-height: 0;
-}
-
-.main-content__body > * {
-  min-width: 0;
-  min-height: 0;
-}
-
-.main-content__body--workspace.main-content__body > .desk-shell {
-  margin-right: calc(-1 * var(--detail-panel-width));
-}
-
 .main-content {
-  padding-right: var(--detail-panel-width);
+  padding-right: 0;
 }
 
 .documents-main--sidebar-hidden {
@@ -74,6 +57,10 @@
   color: var(--muted-subtle);
 }
 
+.main-content .panel-header {
+  margin-right: var(--detail-panel-width);
+}
+
 .main-content__breadcrumbs {
   flex: 1 1 auto;
   overflow: hidden;