1 files changed, 7 insertions, 0 deletions
diff --git a/src/store/taskStore.ts b/src/store/taskStore.ts
index 94386ac..2a3a8be 100644
--- a/src/store/taskStore.ts
+++ b/src/store/taskStore.ts
@@ -1,5 +1,6 @@
 import { create } from 'zustand';
 import { invoke } from '@tauri-apps/api/core';
+import { useTimerStore } from './timerStore';
 
 export interface Task {
   id: string;
@@ -79,5 +80,11 @@ export const useTaskStore = create<TaskStore>((set) => ({
 
   setCurrentTask: async (id) => {
     await invoke('set_current_task', { taskId: id });
+    useTimerStore.getState().setCurrentTaskId(id);
+    try {
+      await useTimerStore.getState().syncFromBackend();
+    } catch (e) {
+      console.error('syncFromBackend after set_current_task error:', e);
+    }
   },
 }));