diff --git a/src/routes/(console)/organization-[organization]/+page.svelte b/src/routes/(console)/organization-[organization]/+page.svelte
index 537f35db5..b8a78484c 100644
--- a/src/routes/(console)/organization-[organization]/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/+page.svelte
@@ -26,6 +26,7 @@
     import { canWriteProjects } from '$lib/stores/roles';
     import { checkPricingRefAndRedirect } from '$lib/helpers/pricingRedirect';
     import { Badge, Icon, Typography, Alert, Tag, Tooltip } from '@appwrite.io/pink-svelte';
+    import { isSmallViewport } from '$lib/stores/viewport';
     import {
         IconAndroid,
         IconApple,
@@ -129,7 +130,9 @@
     }
 
     function formatName(name: string, limit: number = 19) {
-        return name ? (name.length > limit ? `${name.slice(0, limit)}...` : name) : '-';
+        const mobileLimit = 16;
+        const actualLimit = $isSmallViewport ? mobileLimit : limit;
+        return name ? (name.length > actualLimit ? `${name.slice(0, actualLimit)}...` : name) : '-';
     }
 
     $: projectsToArchive = data.projects.projects.filter(
@@ -219,6 +222,7 @@
                         {#if isSetToArchive(project)}
                             <Tag
                                 size="s"
+                                style="white-space: nowrap;"
                                 on:click={(event) => {
                                     event.preventDefault();
                                     showSelectProject = true;