diff --git a/documentation/docs/guides/code-mode.md b/documentation/docs/guides/managing-tools/code-mode.md
similarity index 99%
rename from documentation/docs/guides/code-mode.md
rename to documentation/docs/guides/managing-tools/code-mode.md
index ed1c733564c1..9562f0c75eea 100644
--- a/documentation/docs/guides/code-mode.md
+++ b/documentation/docs/guides/managing-tools/code-mode.md
@@ -1,5 +1,5 @@
 ---
-sidebar_position: 52
+sidebar_position: 3
 title: Code Mode
 sidebar_label: Code Mode
 description: Understanding how Code Mode handles tool discovery and tool calling
diff --git a/documentation/docs/guides/managing-tools/index.md b/documentation/docs/guides/managing-tools/index.md
index 062011b7dd4b..9085badfa6d1 100644
--- a/documentation/docs/guides/managing-tools/index.md
+++ b/documentation/docs/guides/managing-tools/index.md
@@ -25,6 +25,11 @@ import styles from '@site/src/components/Card/styles.module.css';
       description="Customize how tool interactions are displayed, from detailed verbose output to clean concise summaries."
       link="/docs/guides/managing-tools/adjust-tool-output"
     />
+    <Card 
+      title="Code Mode"
+      description="Programmatic approach that discovers and calls MCP tools on demand."
+      link="/docs/guides/managing-tools/code-mode"
+    />
     <Card 
       title="Ollama Tool Shim"
       description="Enable tool calling for models that don't natively support it using an experimental local interpreter model setup."
diff --git a/documentation/docs/guides/tips.md b/documentation/docs/guides/tips.md
index 24a5a2e7dba4..b9d447cc7e6c 100644
--- a/documentation/docs/guides/tips.md
+++ b/documentation/docs/guides/tips.md
@@ -30,7 +30,7 @@ Press `Cmd+Option+Shift+G` (macOS) or `Ctrl+Alt+Shift+G` (Windows/Linux) and sen
 Turning on too many extensions can degrade performance. Enable only essential [extensions and tools](/docs/guides/managing-tools/tool-permissions) to improve tool selection accuracy, save context window space, and stay within provider tool limits.
 
 :::tip Code Execution for Many Extensions
-Consider enabling [Code Mode](/docs/guides/code-mode), an alternative approach to tool calling that discovers tools on demand.
+Consider enabling [Code Mode](/docs/guides/managing-tools/code-mode), an alternative approach to tool calling that discovers tools on demand.
 :::
 
 ### Teach goose your preferences
diff --git a/documentation/docs/mcp/code-execution-mcp.md b/documentation/docs/mcp/code-execution-mcp.md
index 9ff3ea2c21f6..607cd90580f6 100644
--- a/documentation/docs/mcp/code-execution-mcp.md
+++ b/documentation/docs/mcp/code-execution-mcp.md
@@ -8,7 +8,7 @@ import TabItem from '@theme/TabItem';
 import { PlatformExtensionNote } from '@site/src/components/PlatformExtensionNote';
 import GooseBuiltinInstaller from '@site/src/components/GooseBuiltinInstaller';
 
-The Code Execution extension enables [Code Mode](/docs/guides/code-mode), a programmatic approach for interacting with MCP tools.
+The Code Execution extension enables [Code Mode](/docs/guides/managing-tools/code-mode), a programmatic approach for interacting with MCP tools.
 
 In Code Mode, the LLM discovers which tools are available from your enabled extensions and writes JavaScript code that goose runs in one execution instead of calling tools directly and one at a time. This helps manage context window usage more efficiently when multiple extensions are enabled and when performing workflows with multiple tool calls.