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 5fcacf4b85..3b665143d7 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 && !checkState.indeterminate}
+			checked={checkState.checked}
 			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 89c05d17a8..f495441714 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 && !checkState.indeterminate}
+							checked={checkState.checked}
 							class="mr-2 {ICON_CLASS_DEFAULT} shrink-0"
 							indeterminate={checkState.indeterminate}
 							onCheckedChange={() => toolsPanel.toggleGroupByKey(group.key)}
diff --git a/tools/ui/src/lib/components/ui/checkbox/checkbox.svelte b/tools/ui/src/lib/components/ui/checkbox/checkbox.svelte
index ec6d28826e..60ef646fc4 100644
--- a/tools/ui/src/lib/components/ui/checkbox/checkbox.svelte
+++ b/tools/ui/src/lib/components/ui/checkbox/checkbox.svelte
@@ -26,10 +26,10 @@
 >
 	{#snippet children({ checked, indeterminate })}
 		<div class="text-current transition-none" data-slot="checkbox-indicator">
-			{#if checked}
-				<CheckIcon class="size-3.5" />
-			{:else if indeterminate}
+			{#if indeterminate}
 				<MinusIcon class="size-3.5" />
+			{:else if checked}
+				<CheckIcon class="size-3.5" />
 			{/if}
 		</div>
 	{/snippet}