diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddSheet.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddSheet.svelte
index 3b665143d7..5fcacf4b85 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddSheet.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddSheet.svelte
@@ -276,7 +276,7 @@
 		</span>
 
 		<Checkbox
-			checked={checkState.checked}
+			checked={checkState.checked && !checkState.indeterminate}
 			class="{ICON_CLASS_DEFAULT} shrink-0"
 			indeterminate={checkState.indeterminate}
 			onCheckedChange={() => toolsPanel.toggleGroupByKey(group.key)}
diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddToolsSubmenu.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddToolsSubmenu.svelte
index f495441714..89c05d17a8 100644
--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddToolsSubmenu.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddToolsSubmenu.svelte
@@ -120,7 +120,7 @@
 					{#snippet child({ props })}
 						<Checkbox
 							{...props}
-							checked={checkState.checked}
+							checked={checkState.checked && !checkState.indeterminate}
 							class="mr-2 {ICON_CLASS_DEFAULT} shrink-0"
 							indeterminate={checkState.indeterminate}
 							onCheckedChange={() => toolsPanel.toggleGroupByKey(group.key)}