diff --git a/src/lib/components/sidebar.svelte b/src/lib/components/sidebar.svelte
index 4ed4b7920..937c67c38 100644
--- a/src/lib/components/sidebar.svelte
+++ b/src/lib/components/sidebar.svelte
@@ -259,7 +259,7 @@
                         </div>
                     {/if}
                 </Layout.Stack>
-            {:else if $isSmallViewport}
+            {:else if $isTabletViewport}
                 <div class="action-buttons">
                     <Layout.Stack direction="column" gap="s">
                         <DropList show={$feedback.show} scrollable>
diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte
index 5f76c05f2..fcfc39086 100644
--- a/src/lib/layout/shell.svelte
+++ b/src/lib/layout/shell.svelte
@@ -173,7 +173,8 @@
 
     $: subNavigation = $page.data.subNavigation;
 
-    $: isProjectPage = $page.route?.id?.includes('project-');
+    $: shouldRenderSidebar = !$isNewWizardStatusOpen && showSideNavigation;
+    $: hasSidebarSpace = shouldRenderSidebar && !$isTabletViewport && !!selectedProject;
 
     $: {
         if ($isSidebarOpen) {
@@ -205,7 +206,7 @@
         <Navbar {...navbarProps} bind:sideBarIsOpen={$isSidebarOpen} bind:showAccountMenu />
     {/if}
 
-    {#if !$isNewWizardStatusOpen && isProjectPage}
+    {#if shouldRenderSidebar}
         <Sidebar
             project={selectedProject}
             progressCard={getProgressCard()}
@@ -221,8 +222,8 @@
     <div
         class="content"
         class:has-transition={showContentTransition}
-        class:icons-content={state === 'icons' && isProjectPage}
-        class:no-sidebar={!showSideNavigation}>
+        class:icons-content={state === 'icons' && selectedProject}
+        class:no-sidebar={!hasSidebarSpace}>
         <section class="main-content" data-test={showSideNavigation}>
             {#if $page.data?.header}
                 <div class="layout-header">
diff --git a/src/routes/(console)/+layout.svelte b/src/routes/(console)/+layout.svelte
index d3a77a8c4..109bdabb3 100644
--- a/src/routes/(console)/+layout.svelte
+++ b/src/routes/(console)/+layout.svelte
@@ -334,7 +334,6 @@
 <CommandCenter />
 <Shell
     showSideNavigation={page.url.pathname !== '/' &&
-        !page?.params.organization &&
         !page.url.pathname.includes(base + '/account') &&
         !page.url.pathname.includes(base + '/card') &&
         !page.url.pathname.includes(base + '/onboarding')}