diff --git a/internal/server/dashboard.go b/internal/server/dashboard.go
index b4b3c6fe..c49cd96b 100644
--- a/internal/server/dashboard.go
+++ b/internal/server/dashboard.go
@@ -801,7 +801,7 @@ func (s *Server) handleGetProviders(c *gin.Context) {
 		dbMap[cfg.ID] = cfg
 	}
 
-	providerIDs := []string{"openai", "gemini", "deepseek", "grok", "ollama"}
+	providerIDs := []string{"openai", "gemini", "deepseek", "moonshot", "grok", "ollama"}
 	var result []gin.H
 
 	for _, id := range providerIDs {
@@ -822,6 +822,10 @@ func (s *Server) handleGetProviders(c *gin.Context) {
 			name = "DeepSeek"
 			enabled = s.cfg.Providers.DeepSeek.Enabled
 			baseURL = s.cfg.Providers.DeepSeek.BaseURL
+		case "moonshot":
+			name = "Moonshot"
+			enabled = s.cfg.Providers.Moonshot.Enabled
+			baseURL = s.cfg.Providers.Moonshot.BaseURL
 		case "grok":
 			name = "xAI Grok"
 			enabled = s.cfg.Providers.Grok.Enabled
@@ -870,6 +874,7 @@ func (s *Server) handleGetProviders(c *gin.Context) {
 		if s.registry != nil {
 			registryID := id
 			if id == "gemini" { registryID = "google" }
+			if id == "moonshot" { registryID = "moonshot" }
 			if id == "grok" { registryID = "xai" }
 			
 			if pInfo, ok := s.registry.Providers[registryID]; ok {
diff --git a/internal/server/server.go b/internal/server/server.go
index f1fd3dd7..3534d147 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -75,7 +75,7 @@ func (s *Server) RefreshProviders() error {
 		dbMap[cfg.ID] = cfg
 	}
 
-	providerIDs := []string{"openai", "gemini", "deepseek", "grok", "moonshot"}
+	providerIDs := []string{"openai", "gemini", "deepseek", "moonshot", "grok"}
 	for _, id := range providerIDs {
 		// Default values from config
 		enabled := false
@@ -95,14 +95,14 @@ func (s *Server) RefreshProviders() error {
 			enabled = s.cfg.Providers.DeepSeek.Enabled
 			baseURL = s.cfg.Providers.DeepSeek.BaseURL
 			apiKey, _ = s.cfg.GetAPIKey("deepseek")
-		case "grok":
-			enabled = s.cfg.Providers.Grok.Enabled
-			baseURL = s.cfg.Providers.Grok.BaseURL
-			apiKey, _ = s.cfg.GetAPIKey("grok")
 		case "moonshot":
 			enabled = s.cfg.Providers.Moonshot.Enabled
 			baseURL = s.cfg.Providers.Moonshot.BaseURL
 			apiKey, _ = s.cfg.GetAPIKey("moonshot")
+		case "grok":
+			enabled = s.cfg.Providers.Grok.Enabled
+			baseURL = s.cfg.Providers.Grok.BaseURL
+			apiKey, _ = s.cfg.GetAPIKey("grok")
 		}
 
 		// Overrides from DB
@@ -144,14 +144,14 @@ func (s *Server) RefreshProviders() error {
 			cfg := s.cfg.Providers.DeepSeek
 			cfg.BaseURL = baseURL
 			s.providers["deepseek"] = providers.NewDeepSeekProvider(cfg, apiKey)
-		case "grok":
-			cfg := s.cfg.Providers.Grok
-			cfg.BaseURL = baseURL
-			s.providers["grok"] = providers.NewGrokProvider(cfg, apiKey)
 		case "moonshot":
 			cfg := s.cfg.Providers.Moonshot
 			cfg.BaseURL = baseURL
 			s.providers["moonshot"] = providers.NewMoonshotProvider(cfg, apiKey)
+		case "grok":
+			cfg := s.cfg.Providers.Grok
+			cfg.BaseURL = baseURL
+			s.providers["grok"] = providers.NewGrokProvider(cfg, apiKey)
 		}
 	}