diff --git a/plugins/app/src/extensions/components.tsx b/plugins/app/src/extensions/components.tsx
index f17a4149fc..442023a1e7 100644
--- a/plugins/app/src/extensions/components.tsx
+++ b/plugins/app/src/extensions/components.tsx
@@ -74,19 +74,39 @@ export const PageLayout = SwappableComponentBlueprint.make({
       component: SwappablePageLayout,
       loader: () => (props: PageLayoutProps) => {
         const { title, icon, noHeader, headerActions, tabs, children } = props;
+        if (tabs) {
+          return (
+            <Flex
+              direction="column"
+              style={{ flexGrow: 1, minHeight: 0, gap: 0 }}
+            >
+              {!noHeader && (
+                <Header
+                  title={title}
+                  icon={icon}
+                  tabs={tabs}
+                  customActions={headerActions}
+                />
+              )}
+              <main
+                style={{
+                  flex: '1 1 0',
+                  minHeight: 0,
+                  overflow: 'auto',
+                  padding: 0,
+                  margin: 0,
+                }}
+              >
+                {children}
+              </main>
+            </Flex>
+          );
+        }
         return (
           <Flex
             direction="column"
             style={{ flexGrow: 1, minHeight: 0, gap: 0 }}
           >
-            {!noHeader && (
-              <Header
-                title={title}
-                icon={icon}
-                tabs={tabs}
-                customActions={headerActions}
-              />
-            )}
             <main
               style={{
                 flex: '1 1 0',