diff --git a/src/lib/components/workspace/Models/BuiltinTools.svelte b/src/lib/components/workspace/Models/BuiltinTools.svelte
index c6fc2f4bea..a0209a0f16 100644
--- a/src/lib/components/workspace/Models/BuiltinTools.svelte
+++ b/src/lib/components/workspace/Models/BuiltinTools.svelte
@@ -79,9 +79,15 @@
 		}
 	};
 
-	$: allTools = Object.keys(toolLabels ?? {}) as Array<keyof typeof toolLabels>;
+	// with File Context on, attached files go into the prompt instead
+	$: allTools = (Object.keys(toolLabels ?? {}) as Array<keyof typeof toolLabels>).filter((key) =>
+		key === 'files'
+			? (capabilities.file_upload ?? true) && !(capabilities.file_context ?? true)
+			: (capabilities[key] ?? true)
+	);
 
 	export let builtinTools: Record<string, boolean> = {};
+	export let capabilities: Record<string, boolean> = {};
 	export let disabled = false;
 	$: enabledTools = allTools.filter((key) => builtinTools[key] !== false);
 
diff --git a/src/lib/components/workspace/Models/Capabilities.svelte b/src/lib/components/workspace/Models/Capabilities.svelte
index 635ba726a2..478540ef4e 100644
--- a/src/lib/components/workspace/Models/Capabilities.svelte
+++ b/src/lib/components/workspace/Models/Capabilities.svelte
@@ -162,6 +162,6 @@
 	{/if}
 
 	{#if capabilities.builtin_tools}
-		<BuiltinTools bind:builtinTools {disabled} />
+		<BuiltinTools bind:builtinTools {capabilities} {disabled} />
 	{/if}
 </div>