diff --git a/libs/shared/ui/src/lib/components/layouts/breadcrumb/breadcrumb.tsx b/libs/shared/ui/src/lib/components/layouts/breadcrumb/breadcrumb.tsx
index 0371754833..fd2b302314 100644
--- a/libs/shared/ui/src/lib/components/layouts/breadcrumb/breadcrumb.tsx
+++ b/libs/shared/ui/src/lib/components/layouts/breadcrumb/breadcrumb.tsx
@@ -25,6 +25,7 @@ import Icon from '../../icon/icon'
 import { IconAwesomeEnum } from '../../icon/icon-awesome.enum'
 import { MenuItemProps } from '../../menu/menu-item/menu-item'
 import StatusChip from '../../status-chip/status-chip'
+import Tooltip from '../../tooltip/tooltip'
 import BreadcrumbItem from '../breadcrumb-item/breadcrumb-item'
 
 export interface BreadcrumbProps {
@@ -170,17 +171,19 @@ export function BreadcrumbMemo(props: BreadcrumbProps) {
     <div className="flex justify-between w-full">
       <div className="flex h-full items-center">
         {organizationId && (
-          <div className="mr-2">
-            {currentOrganization?.logo_url ? (
-              <img
-                src={currentOrganization?.logo_url}
-                className="h-4"
-                alt={`${currentOrganization?.name} organization`}
-              />
-            ) : (
-              squareContent(currentOrganization?.name.charAt(0), '')
-            )}
-          </div>
+          <Tooltip content={currentOrganization?.name || ''}>
+            <div className="mr-2">
+              {currentOrganization?.logo_url ? (
+                <img
+                  src={currentOrganization?.logo_url}
+                  className="h-4"
+                  alt={`${currentOrganization?.name} organization`}
+                />
+              ) : (
+                squareContent(currentOrganization?.name.charAt(0), '')
+              )}
+            </div>
+          </Tooltip>
         )}
         {clusterId && (
           <BreadcrumbItem
diff --git a/libs/shared/ui/src/lib/components/menu/menu.tsx b/libs/shared/ui/src/lib/components/menu/menu.tsx
index a2b4bf2abc..8d948e4895 100644
--- a/libs/shared/ui/src/lib/components/menu/menu.tsx
+++ b/libs/shared/ui/src/lib/components/menu/menu.tsx
@@ -143,6 +143,7 @@ export function Menu(props: MenuProps) {
         onClose={(e) => handleClick(e)}
         anchorRef={ref}
         align={arrowAlign}
+        viewScroll="close"
         className="menu z-20"
         menuClassName={`rounded-md shadow-[0_0_32px_rgba(0,0,0,0.08)] p-0 ${className} menu__container menu__container--${direction} menu__container--${
           isOpen ? 'open' : 'closed'