diff --git a/packages/toolpad-core/src/DashboardLayout/DashboardLayout.tsx b/packages/toolpad-core/src/DashboardLayout/DashboardLayout.tsx
index 2d921608aba..2eba8c7e418 100644
--- a/packages/toolpad-core/src/DashboardLayout/DashboardLayout.tsx
+++ b/packages/toolpad-core/src/DashboardLayout/DashboardLayout.tsx
@@ -1,7 +1,7 @@
 'use client';
 import * as React from 'react';
 import PropTypes from 'prop-types';
-import { styled, useTheme, type Theme, SxProps } from '@mui/material';
+import { styled, useTheme, SxProps } from '@mui/material';
 import MuiAppBar from '@mui/material/AppBar';
 import Box from '@mui/material/Box';
 import Drawer from '@mui/material/Drawer';
@@ -106,7 +106,7 @@ export interface DashboardLayoutProps {
   /**
    * The system prop that allows defining system overrides as well as additional CSS styles.
    */
-  sx?: SxProps<Theme>;
+  sx?: SxProps;
 }
 
 /**
@@ -327,55 +327,52 @@ function DashboardLayout(props: DashboardLayoutProps) {
     >
       <AppBar color="inherit" position="absolute" sx={{ displayPrint: 'none' }}>
         <Toolbar sx={{ backgroundColor: 'inherit', mx: { xs: -0.75, sm: -1.5 } }}>
-          {!hideNavigation ? (
-            <React.Fragment>
-              <Box
-                sx={{
-                  mr: { sm: disableCollapsibleSidebar ? 0 : 1 },
-                  display: { md: 'none' },
-                }}
-              >
-                {getMenuIcon(isMobileNavigationExpanded)}
-              </Box>
-              <Box
-                sx={{
-                  display: { xs: 'none', md: disableCollapsibleSidebar ? 'none' : 'block' },
-                  mr: disableCollapsibleSidebar ? 0 : 1,
-                }}
-              >
-                {getMenuIcon(isDesktopNavigationExpanded)}
-              </Box>
-            </React.Fragment>
-          ) : null}
-
-          <Box
-            sx={{
-              position: { xs: 'absolute', md: 'static' },
-              left: { xs: '50%', md: 'auto' },
-              transform: { xs: 'translateX(-50%)', md: 'none' },
-            }}
+          <Stack
+            direction="row"
+            sx={{ flexWrap: 'wrap', justifyContent: 'space-between', width: '100%', py: 1.5 }}
           >
-            <Link href="/" style={{ color: 'inherit', textDecoration: 'none' }}>
-              <Stack direction="row" alignItems="center">
-                <LogoContainer>{branding?.logo ?? <ToolpadLogo size={40} />}</LogoContainer>
-                <Typography
-                  variant="h6"
-                  sx={{
-                    color: (theme.vars ?? theme).palette.primary.main,
-                    fontWeight: '700',
-                    ml: 0.5,
-                    whiteSpace: 'nowrap',
-                  }}
-                >
-                  {applicationTitle}
-                </Typography>
-              </Stack>
-            </Link>
-          </Box>
-          <Box sx={{ flexGrow: 1 }} />
-          <Stack direction="row" spacing={1}>
-            <ToolbarActionsSlot {...slotProps?.toolbarActions} />
-            <ToolbarAccountSlot {...slotProps?.toolbarAccount} />
+            <Stack direction="row">
+              {!hideNavigation ? (
+                <React.Fragment>
+                  <Box
+                    sx={{
+                      mr: { sm: disableCollapsibleSidebar ? 0 : 1 },
+                      display: { md: 'none' },
+                    }}
+                  >
+                    {getMenuIcon(isMobileNavigationExpanded)}
+                  </Box>
+                  <Box
+                    sx={{
+                      display: { xs: 'none', md: disableCollapsibleSidebar ? 'none' : 'block' },
+                      mr: disableCollapsibleSidebar ? 0 : 1,
+                    }}
+                  >
+                    {getMenuIcon(isDesktopNavigationExpanded)}
+                  </Box>
+                </React.Fragment>
+              ) : null}
+              <Link href="/" style={{ color: 'inherit', textDecoration: 'none' }}>
+                <Stack direction="row" alignItems="center">
+                  <LogoContainer>{branding?.logo ?? <ToolpadLogo size={40} />}</LogoContainer>
+                  <Typography
+                    variant="h6"
+                    sx={{
+                      color: (theme.vars ?? theme).palette.primary.main,
+                      fontWeight: '700',
+                      ml: 0.5,
+                      whiteSpace: 'nowrap',
+                    }}
+                  >
+                    {applicationTitle}
+                  </Typography>
+                </Stack>
+              </Link>
+            </Stack>
+            <Stack direction="row" spacing={1} sx={{ marginLeft: 'auto' }}>
+              <ToolbarActionsSlot {...slotProps?.toolbarActions} />
+              <ToolbarAccountSlot {...slotProps?.toolbarAccount} />
+            </Stack>
           </Stack>
         </Toolbar>
       </AppBar>
diff --git a/packages/toolpad-studio/src/runtime/AppLayout.tsx b/packages/toolpad-studio/src/runtime/AppLayout.tsx
index 35f81c63b6e..7c25b46db1b 100644
--- a/packages/toolpad-studio/src/runtime/AppLayout.tsx
+++ b/packages/toolpad-studio/src/runtime/AppLayout.tsx
@@ -52,7 +52,7 @@ export function AppLayout({
 
   const hasLayout = hasLayoutProp && hasShell;
 
-  const { session, signOut } = React.useContext(AuthContext);
+  const { session, signOut, hasAuthentication } = React.useContext(AuthContext);
 
   const navigation = React.useMemo(
     () =>
@@ -63,9 +63,18 @@ export function AppLayout({
     [pages, retainedSearch],
   );
 
-  const signIn = React.useCallback(() => {
-    navigate('/signin');
-  }, [navigate]);
+  const authentication = React.useMemo(
+    () =>
+      hasAuthentication
+        ? {
+            signIn: () => {
+              navigate('/signin');
+            },
+            signOut,
+          }
+        : undefined,
+    [hasAuthentication, navigate, signOut],
+  );
 
   const layoutContent = (
     <Box sx={{ minWidth: 0, flex: 1, position: 'relative', flexDirection: 'column' }}>
@@ -80,10 +89,7 @@ export function AppLayout({
       branding={{
         title: 'Toolpad Studio',
       }}
-      authentication={{
-        signIn,
-        signOut,
-      }}
+      authentication={authentication}
       session={session}
     >
       {hasLayout ? (
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1bf1c04ca87..813f6df256c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4042,8 +4042,8 @@ packages:
     engines: {node: '>=18'}
     peerDependencies:
       '@testing-library/dom': ^10.0.0
-      '@types/react': ^18.0.0
-      '@types/react-dom': ^18.0.0
+      '@types/react': ^18.3.11
+      '@types/react-dom': 18.3.1
       react: ^18.0.0
       react-dom: ^18.0.0
     peerDependenciesMeta: