diff --git a/src/renderer/components/titlebar/Titlebar.tsx b/src/renderer/components/titlebar/Titlebar.tsx
index 21dbaf48f..582014868 100644
--- a/src/renderer/components/titlebar/Titlebar.tsx
+++ b/src/renderer/components/titlebar/Titlebar.tsx
@@ -101,7 +101,11 @@ const Titlebar: React.FC<TitlebarProps> = ({
     showKanban: isKanbanOpen,
     showEditorMode: isEditorOpen,
   } = useProjectManagementContext();
-  const { activeTask, handleSelectTask: onSelectTask } = useTaskManagementContext();
+  const {
+    activeTask,
+    handleSelectTask: onSelectTask,
+    tasksByProjectId,
+  } = useTaskManagementContext();
   const { user: githubUser } = useGithubContext();
 
   const isTaskMultiAgent = Boolean(activeTask?.metadata?.multiAgent?.enabled);
@@ -207,6 +211,7 @@ const Titlebar: React.FC<TitlebarProps> = ({
             <TitlebarContext
               projects={projects}
               selectedProject={selectedProject}
+              tasks={selectedProject ? (tasksByProjectId[selectedProject.id] ?? []) : []}
               activeTask={activeTask}
               onSelectProject={onSelectProject}
               onSelectTask={onSelectTask}
diff --git a/src/renderer/components/titlebar/TitlebarContext.tsx b/src/renderer/components/titlebar/TitlebarContext.tsx
index d7f8614b5..5fa3ca0f4 100644
--- a/src/renderer/components/titlebar/TitlebarContext.tsx
+++ b/src/renderer/components/titlebar/TitlebarContext.tsx
@@ -5,6 +5,7 @@ import type { Project, Task } from '../../types/app';
 interface TitlebarContextProps {
   projects: Project[];
   selectedProject: Project | null;
+  tasks: Task[];
   activeTask: Task | null;
   onSelectProject: (project: Project) => void;
   onSelectTask: (task: Task) => void;
@@ -13,6 +14,7 @@ interface TitlebarContextProps {
 const TitlebarContext: React.FC<TitlebarContextProps> = ({
   projects,
   selectedProject,
+  tasks,
   activeTask,
   onSelectProject,
   onSelectTask,
@@ -20,8 +22,6 @@ const TitlebarContext: React.FC<TitlebarContextProps> = ({
   if (!selectedProject) {
     return <div />;
   }
-
-  const tasks = selectedProject?.tasks ?? [];
   const projectValue = selectedProject.id;
   const noTaskValue = '__no_task_selected__';
   const taskValue = activeTask?.id ?? noTaskValue;