diff --git a/frontend/src/components/workspace/workspace-header.tsx b/frontend/src/components/workspace/workspace-header.tsx
index d632171..db21ee9 100644
--- a/frontend/src/components/workspace/workspace-header.tsx
+++ b/frontend/src/components/workspace/workspace-header.tsx
@@ -1,34 +1,58 @@
 "use client";
 
+import { MessageSquarePlus } from "lucide-react";
 import Link from "next/link";
+import { usePathname } from "next/navigation";
 
-import { SidebarTrigger, useSidebar } from "@/components/ui/sidebar";
+import {
+  SidebarMenu,
+  SidebarMenuButton,
+  SidebarMenuItem,
+  SidebarTrigger,
+  useSidebar,
+} from "@/components/ui/sidebar";
 import { cn } from "@/lib/utils";
 
 export function WorkspaceHeader({ className }: { className?: string }) {
   const { state } = useSidebar();
+  const pathname = usePathname();
   return (
-    <div
-      className={cn(
-        "group/workspace-header flex h-12 flex-col justify-center",
-        className,
-      )}
-    >
-      {state === "collapsed" ? (
-        <div className="group-has-data-[collapsible=icon]/sidebar-wrapper:-translate-y flex w-full cursor-pointer items-center justify-center">
-          <div className="text-primary block font-serif group-hover/workspace-header:hidden">
-            DF
+    <>
+      <div
+        className={cn(
+          "group/workspace-header flex h-12 flex-col justify-center",
+          className,
+        )}
+      >
+        {state === "collapsed" ? (
+          <div className="group-has-data-[collapsible=icon]/sidebar-wrapper:-translate-y flex w-full cursor-pointer items-center justify-center">
+            <div className="text-primary block pt-1 font-serif group-hover/workspace-header:hidden">
+              DF
+            </div>
+            <SidebarTrigger className="hidden pl-2 group-hover/workspace-header:block" />
           </div>
-          <SidebarTrigger className="hidden pl-2 group-hover/workspace-header:block" />
-        </div>
-      ) : (
-        <div className="flex items-center justify-between gap-2">
-          <Link href="/workspace" className="text-primary ml-2 font-serif">
-            DeerFlow
-          </Link>
-          <SidebarTrigger />
-        </div>
-      )}
-    </div>
+        ) : (
+          <div className="flex items-center justify-between gap-2">
+            <Link href="/workspace" className="text-primary ml-2 font-serif">
+              DeerFlow
+            </Link>
+            <SidebarTrigger />
+          </div>
+        )}
+      </div>
+      <SidebarMenu>
+        <SidebarMenuItem>
+          <SidebarMenuButton
+            isActive={pathname === "/workspace/chats/new"}
+            asChild
+          >
+            <Link className="text-muted-foreground" href="/workspace/chats/new">
+              <MessageSquarePlus size={16} />
+              <span>New chat</span>
+            </Link>
+          </SidebarMenuButton>
+        </SidebarMenuItem>
+      </SidebarMenu>
+    </>
   );
 }
diff --git a/frontend/src/components/workspace/workspace-nav-menu.tsx b/frontend/src/components/workspace/workspace-nav-menu.tsx
index 842bc8b..f4203a8 100644
--- a/frontend/src/components/workspace/workspace-nav-menu.tsx
+++ b/frontend/src/components/workspace/workspace-nav-menu.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { MessageSquarePlus, MessagesSquare } from "lucide-react";
+import { MessagesSquare } from "lucide-react";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
 
@@ -14,19 +14,8 @@ import {
 export function WorkspaceNavMenu() {
   const pathname = usePathname();
   return (
-    <SidebarGroup>
+    <SidebarGroup className="pt-1">
       <SidebarMenu>
-        <SidebarMenuItem>
-          <SidebarMenuButton
-            isActive={pathname === "/workspace/chats/new"}
-            asChild
-          >
-            <Link className="text-muted-foreground" href="/workspace/chats/new">
-              <MessageSquarePlus size={16} />
-              <span>New chat</span>
-            </Link>
-          </SidebarMenuButton>
-        </SidebarMenuItem>
         <SidebarMenuItem>
           <SidebarMenuButton isActive={pathname === "/workspace/chats"} asChild>
             <Link className="text-muted-foreground" href="/workspace/chats">