diff --git a/content/en/docs/refguide/mendix-ai-assistance/maia-make/_index.md b/content/en/docs/refguide/mendix-ai-assistance/maia-make/_index.md
index a39633f477d..b0f02d0d469 100644
--- a/content/en/docs/refguide/mendix-ai-assistance/maia-make/_index.md
+++ b/content/en/docs/refguide/mendix-ai-assistance/maia-make/_index.md
@@ -107,7 +107,13 @@ Clicking **New Chat** allows you to clear the messages and start a new conversat
 
 {{< figure src="/attachments/refguide/mendix-ai-assistance/maia-make/maia-make-capabilities/new-chat.jpg" width="250px" alt="" >}}
 
-#### Configure MCP Connections
+#### Settings
+
+The Settings option ({{% icon name="cog" %}}) allows you to manage your MCP Servers, agent skills, and export your Maia agent session.
+
+{{< figure src="/attachments/refguide/mendix-ai-assistance/maia-make/maia-make-capabilities/maia-settings.jpg" width="250px" alt="" >}}
+
+##### Configure MCP Connections (Studio Pro 11.14 and below)
 
 This option ({{% icon name="plug" %}}) allows you to connect external [MCP](https://modelcontextprotocol.io/introduction) servers to Maia, giving it access to third-party tools during chat. For more information on how to configure MCP connections, see [Maia MCP Client](/refguide/maia-mcp/).
 
@@ -125,6 +131,12 @@ The **Add file to Maia Chat** option (@ icon) allows you to add certain logic or
 
 {{< figure src="/attachments/refguide/mendix-ai-assistance/maia-make/maia-make-capabilities/add-files.jpg" width="250px" alt="" >}}
 
+#### Skills
+
+The **Skills** option opens the **Skills** tab of the **Maia Settings** pane and gives you a full overview of the agent skills in your app. This button only appears when you add an agent skill to your app.
+
+{{< figure src="/attachments/refguide/mendix-ai-assistance/maia-make/maia-make-capabilities/skills.jpg" width="250px" alt="" >}}
+
 #### Changed List
 
 A list of items added or changed by Maia appears above the chat box. Click an entry to open the relevant document. To undo all changes, click **Undo all**. To undo a single change, click the undo button on the right side of that item.
diff --git a/content/en/docs/refguide/mendix-ai-assistance/maia-make/maia-agent-skills.md b/content/en/docs/refguide/mendix-ai-assistance/maia-make/maia-agent-skills.md
index e758c630eab..fd93d5c0998 100644
--- a/content/en/docs/refguide/mendix-ai-assistance/maia-make/maia-agent-skills.md
+++ b/content/en/docs/refguide/mendix-ai-assistance/maia-make/maia-agent-skills.md
@@ -61,6 +61,8 @@ To create a new agent skill in Studio Pro, follow these steps:
 
 Studio Pro creates the `SKILL.md` file. You can now add the skill content.
 
+In Studio Pro 11.15 and above, you can see a full overview of the agent skills in your app in the **Skills** tab of the **Maia Settings** pane.
+
 ### SKILL.md Format {#skill-md-format}
 
 Each `SKILL.md` file must include YAML frontmatter at the top, followed by the skill content in Markdown:
diff --git a/content/en/docs/refguide/mendix-ai-assistance/maia-make/maia-mcp.md b/content/en/docs/refguide/mendix-ai-assistance/maia-make/maia-mcp.md
index 128c87d3987..a81c400f023 100644
--- a/content/en/docs/refguide/mendix-ai-assistance/maia-make/maia-mcp.md
+++ b/content/en/docs/refguide/mendix-ai-assistance/maia-make/maia-mcp.md
@@ -24,7 +24,7 @@ For details on the current limitations, see the [Limitations](#limitations) sect
 There are two ways to open the MCP Client panel:
 
 * Open the **Chat** tab in the **Maia** pane, then click **Configure MCP Connections** ({{% icon name="plug" %}}).
-* Go to the **View** menu and click **MCP Settings**.
+* Go to the **View** menu and click **Maia Settings**.
 
 ### Preset Servers {#preset-servers}
 
diff --git a/content/en/docs/refguide/modeling/menus/view-menu/_index.md b/content/en/docs/refguide/modeling/menus/view-menu/_index.md
index 431bb2ed3ee..d2bbdb6e360 100644
--- a/content/en/docs/refguide/modeling/menus/view-menu/_index.md
+++ b/content/en/docs/refguide/modeling/menus/view-menu/_index.md
@@ -117,9 +117,15 @@ The **Maia** pane displays the Maia interface. In this chat, you can create and
 
 For details on using Mendix Marketplace components in your app modeling, see [How to Use Marketplace Content](/appstore/use-content/).
 
-### MCP Settings
+### Maia Settings
 
-The **MCP Settings** pane allows you to connect Maia to External Model Context Protocol (MCP) servers. For more information, see [Maia MCP Client](/refguide/maia-mcp/).
+{{% alert type="info" %}}
+In Studio Pro 11.14 and below, this tab is called **MCP Settings**.
+{{% /alert %}}
+
+The **Maia Settings** pane allows you to connect Maia to External Model Context Protocol (MCP) servers. For Studio Pro 11.15 and above, this pane also stores [Agent Skills (SKILLS.md)](/refguide/maia-agent-skills/).
+
+For more information, see [Maia MCP Client](/refguide/maia-mcp/).
 
 ### OpenAPI Documentation {#api-documentation}
 
diff --git a/static/attachments/refguide/mendix-ai-assistance/maia-make/maia-make-capabilities/maia-settings.jpg b/static/attachments/refguide/mendix-ai-assistance/maia-make/maia-make-capabilities/maia-settings.jpg
new file mode 100644
index 00000000000..7d9fd29922d
Binary files /dev/null and b/static/attachments/refguide/mendix-ai-assistance/maia-make/maia-make-capabilities/maia-settings.jpg differ
diff --git a/static/attachments/refguide/mendix-ai-assistance/maia-make/maia-make-capabilities/new-chat.jpg b/static/attachments/refguide/mendix-ai-assistance/maia-make/maia-make-capabilities/new-chat.jpg
index 888077b8b30..7d78cf6be49 100644
Binary files a/static/attachments/refguide/mendix-ai-assistance/maia-make/maia-make-capabilities/new-chat.jpg and b/static/attachments/refguide/mendix-ai-assistance/maia-make/maia-make-capabilities/new-chat.jpg differ
diff --git a/static/attachments/refguide/mendix-ai-assistance/maia-make/maia-make-capabilities/skills.jpg b/static/attachments/refguide/mendix-ai-assistance/maia-make/maia-make-capabilities/skills.jpg
new file mode 100644
index 00000000000..793bb944bbe
Binary files /dev/null and b/static/attachments/refguide/mendix-ai-assistance/maia-make/maia-make-capabilities/skills.jpg differ