diff --git a/frontendv2/src/app/(app)/server/[uuidShort]/files/edit/page.tsx b/frontendv2/src/app/(app)/server/[uuidShort]/files/edit/page.tsx
index a5b079e4..3dc3f6b9 100644
--- a/frontendv2/src/app/(app)/server/[uuidShort]/files/edit/page.tsx
+++ b/frontendv2/src/app/(app)/server/[uuidShort]/files/edit/page.tsx
@@ -393,7 +393,7 @@ export default function FileEditorPage({
     }
 
     return (
-        <div className='relative flex h-full min-h-0 flex-col gap-6 overflow-y-auto pb-4'>
+        <div className='relative flex min-h-0 flex-1 flex-col gap-6 overflow-y-auto pb-4'>
             <WidgetRenderer widgets={getWidgets('server-file-editor', 'top-of-page')} />
             <PageHeader
                 title={t('files.editor.title', { file: fileName })}
@@ -466,7 +466,7 @@ export default function FileEditorPage({
                     onSwitchToRaw={handleSwitchToRawEditor}
                 />
             ) : (
-                <div className='border-border/50 bg-card/50 group hover:border-border/80 relative flex min-h-0 flex-1 flex-col overflow-visible rounded-4xl border p-1 backdrop-blur-3xl transition-all'>
+                <div className='border-border/50 bg-card/50 group hover:border-border/80 relative flex min-h-0 flex-1 flex-col overflow-hidden rounded-4xl border p-1 backdrop-blur-3xl transition-all'>
                     <div className='border-border/10 bg-muted/30 flex shrink-0 items-center justify-between border-b p-3'>
                         <div className='flex items-center gap-3'>
                             <div className='bg-primary/10 text-primary border-primary/20 flex h-9 w-9 items-center justify-center rounded-xl border'>
diff --git a/frontendv2/src/components/layout/DashboardShell.tsx b/frontendv2/src/components/layout/DashboardShell.tsx
index cce8ef46..e35429b1 100644
--- a/frontendv2/src/components/layout/DashboardShell.tsx
+++ b/frontendv2/src/components/layout/DashboardShell.tsx
@@ -164,17 +164,18 @@ export default function DashboardShell({ children }: { children: React.ReactNode
 
                     <main
                         className={cn(
-                            'flex-1',
+                            'flex min-h-0 flex-1 flex-col',
                             isFullWidthMode ? 'overflow-hidden p-0' : 'px-3 py-5 sm:px-6 sm:py-6 lg:px-8',
                         )}
                     >
                         <div
                             className={cn(
+                                'flex min-h-0 flex-1 flex-col',
                                 isFullWidthMode && 'h-full',
                                 !isFullWidthMode &&
                                     (isServerConsoleHome
                                         ? 'mx-auto w-full max-w-[min(100rem,calc(100vw-1.5rem))] sm:max-w-[min(100rem,calc(100vw-2rem))]'
-                                        : 'mx-auto max-w-7xl'),
+                                        : 'mx-auto w-full max-w-7xl'),
                             )}
                         >
                             {children}