diff --git a/internal/ui/chat/docker_mcp.go b/internal/ui/chat/docker_mcp.go
index 73d10b4803ff7a2e559ce4aba753fbb8e7ebb264..57cd9da55f83e63279413d9801337236290d5cdc 100644
--- a/internal/ui/chat/docker_mcp.go
+++ b/internal/ui/chat/docker_mcp.go
@@ -3,6 +3,7 @@ package chat
 import (
 	"encoding/json"
 	"fmt"
+	"sort"
 	"strings"
 
 	"charm.land/lipgloss/v2"
@@ -102,8 +103,13 @@ func (d *DockerMCPToolRenderContext) RenderTool(sty *styles.Styles, width int, o
 
 	var toolParams []string
 	toolParams = append(toolParams, mainParam)
-	for k, v := range extraArgs {
-		toolParams = append(toolParams, k, v)
+	keys := make([]string, 0, len(extraArgs))
+	for k := range extraArgs {
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+	for _, k := range keys {
+		toolParams = append(toolParams, k, extraArgs[k])
 	}
 
 	if opts.IsPending() {