diff --git a/src/layout/Page/Page.jsx b/src/layout/Page/Page.jsx
index 841f745b0..3edc0d4fc 100644
--- a/src/layout/Page/Page.jsx
+++ b/src/layout/Page/Page.jsx
@@ -102,7 +102,7 @@ const Page = () => {
       {projectName && <Sidebar projectName={projectName} />}
       <SidebarInset>
         <>
-          <Suspense>
+          <Suspense fallback={<Loader />}>
             <main id="main" ref={mainRef}>
               <div id="main-wrapper">{isProjectsFetched ? <Outlet /> : <Loader />}</div>
             </main>
diff --git a/src/nextGenComponents/shared/Sidebar/ProjectDropdown/ProjectDropdown.jsx b/src/nextGenComponents/shared/Sidebar/ProjectDropdown/ProjectDropdown.jsx
index 24a3d0a3c..012f7fd0f 100644
--- a/src/nextGenComponents/shared/Sidebar/ProjectDropdown/ProjectDropdown.jsx
+++ b/src/nextGenComponents/shared/Sidebar/ProjectDropdown/ProjectDropdown.jsx
@@ -31,6 +31,7 @@ import {
   DropdownMenuContent,
   DropdownMenuItem,
   DropdownMenuTrigger,
+  EllipsisTooltip,
   Input,
   Tooltip,
   TooltipContent,
@@ -140,7 +141,9 @@ const ProjectDropdown = ({ projectName }) => {
                         to={project.link}
                         className={itemClassName}
                       >
-                        <span>{project.label}</span>
+                        <EllipsisTooltip className="min-w-0 flex-1 whitespace-nowrap">
+                          {project.label}
+                        </EllipsisTooltip>
                         {project.isCurrent && (
                           <Check className="h-4 w-4 shrink-0 text-green-600" aria-hidden="true" />
                         )}