diff --git a/packages/frontend-2/components/projects/DashboardFilled.vue b/packages/frontend-2/components/projects/DashboardFilled.vue
index 7ae1555967..e5e492f5ca 100644
--- a/packages/frontend-2/components/projects/DashboardFilled.vue
+++ b/packages/frontend-2/components/projects/DashboardFilled.vue
@@ -5,6 +5,7 @@
         :key="project.id"
         :project="project"
         :show-workspace-link="showWorkspaceLink"
+        :workspace-page="workspacePage"
       />
     </div>
   </div>
@@ -21,6 +22,7 @@ import type {
 const props = defineProps<{
   projects: ProjectsDashboardFilledProjectFragment | ProjectsDashboardFilledUserFragment
   showWorkspaceLink?: boolean
+  workspacePage?: boolean
 }>()
 
 graphql(`
diff --git a/packages/frontend-2/components/projects/HiddenProjectWarning.vue b/packages/frontend-2/components/projects/HiddenProjectWarning.vue
index 406a742f5e..18263d636a 100644
--- a/packages/frontend-2/components/projects/HiddenProjectWarning.vue
+++ b/packages/frontend-2/components/projects/HiddenProjectWarning.vue
@@ -8,7 +8,7 @@
       in SSO-protected workspaces. To view {{ hiddenItemCount === 1 ? 'it' : 'them' }},
       authenticate with:
     </p>
-    <div class="flex gap-2 mt-2">
+    <div class="flex flex-wrap gap-2 mt-2">
       <FormButton
         v-for="session in user.expiredSsoSessions"
         :key="session.id"
diff --git a/packages/frontend-2/components/projects/ProjectDashboardCard.vue b/packages/frontend-2/components/projects/ProjectDashboardCard.vue
index c16a45d277..44c7b7aca2 100644
--- a/packages/frontend-2/components/projects/ProjectDashboardCard.vue
+++ b/packages/frontend-2/components/projects/ProjectDashboardCard.vue
@@ -98,6 +98,7 @@ import { workspaceRoute } from '~/lib/common/helpers/route'
 const props = defineProps<{
   project: ProjectDashboardItemFragment
   showWorkspaceLink?: boolean
+  workspacePage?: boolean
 }>()
 
 const router = useRouter()
@@ -141,16 +142,16 @@ const gridClasses = computed(() => [
   // Grid columns
   'grid-cols-1',
   'sm:grid-cols-2',
-  'lg:grid-cols-1',
-  'xl:grid-cols-2',
-  '2xl:grid-cols-3',
+  props.workspacePage && 'lg:grid-cols-1',
+  props.workspacePage ? 'xl:grid-cols-2' : 'xl:grid-cols-3',
+  props.workspacePage && '2xl:grid-cols-3',
 
   // Visibility rules
   'sm:[&>*:nth-child(n+3)]:hidden',
-  'lg:[&>*:nth-child(n+2)]:hidden',
-  'xl:[&>*:nth-child(n+2)]:block',
-  'xl:[&>*:nth-child(n+3)]:hidden',
-  '2xl:[&>*:nth-child(n+2)]:block',
+  props.workspacePage && 'lg:[&>*:nth-child(n+2)]:hidden',
+  props.workspacePage && 'xl:[&>*:nth-child(n+2)]:block',
+  !props.workspacePage && 'xl:[&>*:nth-child(n+3)]:block',
+  props.workspacePage && '2xl:[&>*:nth-child(n+2)]:block',
   '2xl:[&>*:nth-child(n+3)]:block'
 ])
 </script>
diff --git a/packages/frontend-2/components/workspace/ProjectList.vue b/packages/frontend-2/components/workspace/ProjectList.vue
index e40797ebfc..5fa05b2e6d 100644
--- a/packages/frontend-2/components/workspace/ProjectList.vue
+++ b/packages/frontend-2/components/workspace/ProjectList.vue
@@ -61,7 +61,7 @@
       </section>
 
       <template v-else-if="projects?.items?.length">
-        <ProjectsDashboardFilled :projects="projects" />
+        <ProjectsDashboardFilled :projects="projects" workspace-page />
         <InfiniteLoading :settings="{ identifier }" @infinite="onInfiniteLoad" />
       </template>