diff --git a/src/agent/tools/shared.ts b/src/agent/tools/shared.ts
index 7ffb8eb..78dcc73 100644
--- a/src/agent/tools/shared.ts
+++ b/src/agent/tools/shared.ts
@@ -73,8 +73,8 @@ export const TOOL_TIMEOUT_MS: Record<string, number> = {
   CallMcpTool: 45_000,
   FetchMcpResource: 30_000,
   ListMcpResources: 15_000,
-  TodoWrite: 5_000,
-  TodoRead: 5_000,
+  TodoWrite: 15_000,
+  TodoRead: 15_000,
   WritePlan: 10_000,
   SwitchMode: 5_000,
   // Foreground Task budget (bg subagents use BG_SUBAGENT_MAX_MS in loop).
diff --git a/webview-ui/settings/App.tsx b/webview-ui/settings/App.tsx
index 0c23d71..5cf5115 100644
--- a/webview-ui/settings/App.tsx
+++ b/webview-ui/settings/App.tsx
@@ -99,8 +99,8 @@ const TOOL_TIMEOUT_DEFAULTS: { name: string; sec: number }[] = [
   { name: "CallMcpTool", sec: 45 },
   { name: "FetchMcpResource", sec: 30 },
   { name: "ListMcpResources", sec: 15 },
-  { name: "TodoWrite", sec: 5 },
-  { name: "TodoRead", sec: 5 },
+  { name: "TodoWrite", sec: 15 },
+  { name: "TodoRead", sec: 15 },
   { name: "WritePlan", sec: 10 },
   { name: "SwitchMode", sec: 5 },
   { name: "Task", sec: 360 },