diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte
index bfc06264ff..c902ddc290 100644
--- a/src/lib/layout/shell.svelte
+++ b/src/lib/layout/shell.svelte
@@ -123,7 +123,11 @@
     });
 
     // subscriptions
-    isNewWizardStatusOpen.subscribe((value) => (showHeader = !value));
+    isNewWizardStatusOpen.subscribe((value) => {
+        if (showHeader) {
+            showHeader = !value;
+        }
+    });
 
     page.subscribe(({ url }) => {
         $showSubNavigation = url.searchParams.get('openNavbar') === 'true';
diff --git a/src/routes/(console)/+layout.svelte b/src/routes/(console)/+layout.svelte
index 1b0748e124..e26ff7e688 100644
--- a/src/routes/(console)/+layout.svelte
+++ b/src/routes/(console)/+layout.svelte
@@ -339,8 +339,8 @@
         !page.url.pathname.includes('/console/account') &&
         !page.url.pathname.includes('/console/card') &&
         !page.url.pathname.includes('/console/onboarding')}
-    showHeader={!page.url.pathname.includes('/console/onboarding/create-project')}
-    showFooter={!page.url.pathname.includes('/console/onboarding/create-project')}
+    showHeader={!page.url.pathname.includes('/console/onboarding')}
+    showFooter={!page.url.pathname.includes('/console/onboarding')}
     selectedProject={page.data?.project}>
     <!--    <Header slot="header" />-->
     <slot />