diff --git a/gui/src/components/modelSelection/quickSetup/QuickModelSetup.tsx b/gui/src/components/modelSelection/quickSetup/QuickModelSetup.tsx
index 400c432ee7..68a1a8c6c3 100644
--- a/gui/src/components/modelSelection/quickSetup/QuickModelSetup.tsx
+++ b/gui/src/components/modelSelection/quickSetup/QuickModelSetup.tsx
@@ -86,10 +86,20 @@ function QuickModelSetup(props: QuickModelSetupProps) {
         {selectedProvider.apiKeyUrl && (
           <>
             <h4>3. Paste your API key</h4>
+            {selectedModel.params.model.startsWith("codestral") && (
+              <i>
+                Note: Codestral requires a different API key from other Mistral
+                models
+              </i>
+            )}
             <SecondaryButton
               className="w-full border-2 border-solid"
               onClick={() => {
-                ideMessenger.post("openUrl", selectedProvider.apiKeyUrl);
+                let apiKeyUrl = selectedProvider.apiKeyUrl;
+                if (selectedModel.params.model.startsWith("codestral")) {
+                  apiKeyUrl = "https://console.mistral.ai/codestral";
+                }
+                ideMessenger.post("openUrl", apiKeyUrl);
               }}
             >
               Get API Key
diff --git a/gui/src/util/modelData.ts b/gui/src/util/modelData.ts
index a4a0f35c94..934f0c47c0 100644
--- a/gui/src/util/modelData.ts
+++ b/gui/src/util/modelData.ts
@@ -781,7 +781,7 @@ export const PROVIDER_INFO: { [key: string]: ModelInfo } = {
     description:
       "The Mistral API provides seamless access to their models, including Codestral, Mistral 8x22B, Mistral Large, and more.",
     icon: "mistral.png",
-    longDescription: `To get access to the Mistral API, obtain your API key from the [Mistral platform](https://docs.mistral.ai/)`,
+    longDescription: `To get access to the Mistral API, obtain your API key from [here](https://console.mistral.ai/codestral) for Codestral or the [Mistral platform](https://docs.mistral.ai/) for all other models.`,
     tags: [
       ModelProviderTag["Requires API Key"],
       ModelProviderTag["Open-Source"],
@@ -807,7 +807,7 @@ export const PROVIDER_INFO: { [key: string]: ModelInfo } = {
       mistral8x7b,
       mistral7b,
     ],
-    apiKeyUrl: "https://console.mistral.ai/api-keys/",
+    apiKeyUrl: "https://console.mistral.ai/codestral",
   },
   ollama: {
     title: "Ollama",