diff --git a/apps/mail/components/magicui/file-tree.tsx b/apps/mail/components/magicui/file-tree.tsx
index 58129f6d53..dab0833457 100644
--- a/apps/mail/components/magicui/file-tree.tsx
+++ b/apps/mail/components/magicui/file-tree.tsx
@@ -229,10 +229,10 @@ const Folder = forwardRef<HTMLDivElement, FolderProps & React.HTMLAttributes<HTM
       <Accordion.Item {...props} value={value} className="relative h-full overflow-hidden">
         <div
           className={cn(
-            `hover:bg-sidebar-accent-foreground flex items-center gap-1 rounded-lg px-2 py-1.5 text-sm dark:hover:bg-[#202020]`,
+            `hover:bg-subtleWhite flex items-center gap-1 rounded-lg px-2 py-1.5 text-sm dark:hover:bg-[#202020]`,
             className,
             {
-              'bg-muted rounded-md': isSelect && isSelectable,
+              'bg-sidebar-accent rounded-md': isSelect && isSelectable,
               'cursor-pointer': isSelectable,
               'cursor-not-allowed opacity-50': !isSelectable,
             },
diff --git a/apps/mail/components/ui/nav-main.tsx b/apps/mail/components/ui/nav-main.tsx
index b85a811060..054a6a5069 100644
--- a/apps/mail/components/ui/nav-main.tsx
+++ b/apps/mail/components/ui/nav-main.tsx
@@ -429,7 +429,7 @@ export function NavMain({ items }: NavMainProps) {
               </div>
 
               <div className="mr-0 flex-1 pr-0">
-                <div className="bg-background relative -m-2 flex-1 overflow-auto">
+                <div className="bg-background relative -m-2 flex-1 max-h-48 overflow-auto hide-scrollbar">
                   <Tree className="bg-background rounded-md">
                     {(() => {
                       if (!data) return null;