diff --git a/app/MindWork AI Studio/Components/Pages/Settings.razor b/app/MindWork AI Studio/Components/Pages/Settings.razor
index eeb6e3b..2820b10 100644
--- a/app/MindWork AI Studio/Components/Pages/Settings.razor	
+++ b/app/MindWork AI Studio/Components/Pages/Settings.razor	
@@ -20,7 +20,7 @@
             <MudTh Style="text-align: left;">Actions</MudTh>
         </HeaderContent>
         <RowTemplate>
-            <MudTd></MudTd>
+            <MudTd>@context.Num</MudTd>
             <MudTd>@context.InstanceName</MudTd>
             <MudTd>@context.UsedProvider</MudTd>
             <MudTd>@context.Model</MudTd>
diff --git a/app/MindWork AI Studio/Components/Pages/Settings.razor.cs b/app/MindWork AI Studio/Components/Pages/Settings.razor.cs
index ce824e3..b287877 100644
--- a/app/MindWork AI Studio/Components/Pages/Settings.razor.cs	
+++ b/app/MindWork AI Studio/Components/Pages/Settings.razor.cs	
@@ -52,6 +52,8 @@ public partial class Settings : ComponentBase
             return;
 
         var addedProvider = (AIStudio.Settings.Provider)dialogResult.Data;
+        addedProvider = addedProvider with { Num = this.SettingsManager.ConfigurationData.NextProviderNum++ };
+        
         this.SettingsManager.ConfigurationData.Providers.Add(addedProvider);
         await this.SettingsManager.StoreSettings();
     }
@@ -60,6 +62,7 @@ public partial class Settings : ComponentBase
     {
         var dialogParameters = new DialogParameters<ProviderDialog>
         {
+            { x => x.DataNum, provider.Num },
             { x => x.DataId, provider.Id },
             { x => x.DataInstanceName, provider.InstanceName },
             { x => x.DataProvider, provider.UsedProvider },
@@ -73,6 +76,12 @@ public partial class Settings : ComponentBase
             return;
 
         var editedProvider = (AIStudio.Settings.Provider)dialogResult.Data;
+        
+        // Set the provider number if it's not set. This is important for providers
+        // added before we started saving the provider number.
+        if(editedProvider.Num == 0)
+            editedProvider = editedProvider with { Num = this.SettingsManager.ConfigurationData.NextProviderNum++ };
+        
         this.SettingsManager.ConfigurationData.Providers[this.SettingsManager.ConfigurationData.Providers.IndexOf(provider)] = editedProvider;
         await this.SettingsManager.StoreSettings();
     }
diff --git a/app/MindWork AI Studio/Settings/Data.cs b/app/MindWork AI Studio/Settings/Data.cs
index ff89a31..465ebe6 100644
--- a/app/MindWork AI Studio/Settings/Data.cs	
+++ b/app/MindWork AI Studio/Settings/Data.cs	
@@ -14,7 +14,12 @@ public sealed class Data
     /// <summary>
     /// List of configured providers.
     /// </summary>
-    public List<Provider> Providers { get; init; } = new();
+    public List<Provider> Providers { get; init; } = [];
+
+    /// <summary>
+    /// The next provider number to use.
+    /// </summary>
+    public uint NextProviderNum { get; set; } = 1;
 
     /// <summary>
     /// Should we save energy? When true, we will update content streamed
diff --git a/app/MindWork AI Studio/Settings/Provider.cs b/app/MindWork AI Studio/Settings/Provider.cs
index 1c94814..d1f6194 100644
--- a/app/MindWork AI Studio/Settings/Provider.cs	
+++ b/app/MindWork AI Studio/Settings/Provider.cs	
@@ -5,11 +5,12 @@ namespace AIStudio.Settings;
 /// <summary>
 /// Data model for configured providers.
 /// </summary>
+/// <param name="Num">The provider's number.</param>
 /// <param name="Id">The provider's ID.</param>
 /// <param name="InstanceName">The provider's instance name. Useful for multiple instances of the same provider, e.g., to distinguish between different OpenAI API keys.</param>
 /// <param name="UsedProvider">The provider used.</param>
 /// <param name="Model">The LLM model to use for chat.</param>
-public readonly record struct Provider(string Id, string InstanceName, Providers UsedProvider, Model Model)
+public readonly record struct Provider(uint Num, string Id, string InstanceName, Providers UsedProvider, Model Model)
 {
     #region Overrides of ValueType
 
diff --git a/app/MindWork AI Studio/Settings/ProviderDialog.razor.cs b/app/MindWork AI Studio/Settings/ProviderDialog.razor.cs
index 6a668ae..1a267ca 100644
--- a/app/MindWork AI Studio/Settings/ProviderDialog.razor.cs	
+++ b/app/MindWork AI Studio/Settings/ProviderDialog.razor.cs	
@@ -16,6 +16,12 @@ public partial class ProviderDialog : ComponentBase
 {
     [CascadingParameter]
     private MudDialogInstance MudDialog { get; set; } = null!;
+
+    /// <summary>
+    /// The provider's number in the list.
+    /// </summary>
+    [Parameter]
+    public uint DataNum { get; set; }
     
     /// <summary>
     /// The provider's ID.
@@ -129,6 +135,7 @@ public partial class ProviderDialog : ComponentBase
         // We just return this data to the parent component:
         var addedProvider = new Provider
         {
+            Num = this.DataNum,
             Id = this.DataId,
             InstanceName = this.DataInstanceName,
             UsedProvider = this.DataProvider,