diff --git a/src/frontend/src/components/EdictBoard.tsx b/src/frontend/src/components/EdictBoard.tsx
index f08dded..72b9b83 100644
--- a/src/frontend/src/components/EdictBoard.tsx
+++ b/src/frontend/src/components/EdictBoard.tsx
@@ -478,11 +478,11 @@ export default function EdictBoard() {
             color: 'var(--fg)', cursor: 'pointer', minWidth: 120,
           }}
         >
-          <option value="">📋 全部任务 ({(() => { const af = archiveFilter; return Object.values(projects).reduce((sum: number, p: any) => sum + (af === 'archived' ? (p.task_count_archived || 0) : af === 'all' ? (p.task_count_total || 0) : (p.task_count || 0)), 0); })()})</option>
-          <option value="_general">📝 一般任务 ({(() => { const p = projects['_general'] as any; const af = archiveFilter; return af === 'archived' ? (p?.task_count_archived || 0) : af === 'all' ? (p?.task_count_total || 0) : (p?.task_count || 0); })()})</option>
+          <option value="">⮜ 全部任务 ({countAllByFilter()})</option>
+          <option value="_general">📝 一般任务 ({countByProjectAndFilter('_general')})</option>
           <option disabled style={{ color: '#555' }}>── 正式项目 ──</option>
           {Object.entries(projects).filter(([pid]) => !pid.startsWith('_') && pid !== '__general__').map(([pid, info]: [string, any]) => (
-            <option key={pid} value={pid}>📁 {info.name || pid} ({archiveFilter === 'archived' ? (info.task_count_archived || 0) : archiveFilter === 'all' ? (info.task_count_total || 0) : (info.task_count || 0)})</option>
+            <option key={pid} value={pid}>📁 {info.name || pid} ({countByProjectAndFilter(pid)})</option>
           ))}
         </select>
         {selectedProjectId && !selectedProjectId.startsWith('_') && selectedProjectId !== '__general__' && (() => {
diff --git a/src/frontend/src/components/TaskModal.tsx b/src/frontend/src/components/TaskModal.tsx
index 451b5f4..06b9d34 100644
--- a/src/frontend/src/components/TaskModal.tsx
+++ b/src/frontend/src/components/TaskModal.tsx
@@ -386,7 +386,7 @@ export default function TaskModal() {
             <span style={{ margin: '0 8px' }}>·</span>
             <span>更新于 {fmtTime(task.updated_at)}</span>
             <span style={{ margin: '0 8px' }}>·</span>
-            <ProjectSelector taskId={task.id} currentProject={selectedProjectId} projects={projects} />
+            <ProjectSelector taskId={task.id} currentProject={(task as any)?._projectId || selectedProjectId} projects={projects} />
           </div>
         </div>