diff --git a/app/MindWork AI Studio/Dialogs/ProviderDialog.razor.cs b/app/MindWork AI Studio/Dialogs/ProviderDialog.razor.cs
index 09c32b93..0d55ade6 100644
--- a/app/MindWork AI Studio/Dialogs/ProviderDialog.razor.cs	
+++ b/app/MindWork AI Studio/Dialogs/ProviderDialog.razor.cs	
@@ -126,6 +126,10 @@ public partial class ProviderDialog : ComponentBase
         {
             this.dataEditingPreviousInstanceName = this.DataInstanceName.ToLowerInvariant();
             
+            // When using Fireworks, we must copy the model name:
+            if (this.DataProvider is Providers.FIREWORKS)
+                this.dataManuallyModel = this.DataModel.Id;
+            
             //
             // We cannot load the API key for self-hosted providers:
             //
diff --git a/app/MindWork AI Studio/wwwroot/changelog/v0.9.7.md b/app/MindWork AI Studio/wwwroot/changelog/v0.9.7.md
index 718f1ccc..962678c7 100644
--- a/app/MindWork AI Studio/wwwroot/changelog/v0.9.7.md	
+++ b/app/MindWork AI Studio/wwwroot/changelog/v0.9.7.md	
@@ -1,4 +1,5 @@
 # v0.9.7, build 182 (2024-09-09 xx:xx UTC)
 - Added an introductory description to the provider settings.
+- Fixed the bug that the model name for Fireworks was not loaded when editing the provider settings.
 - Improved hyphenation for continuous text so that the rules of the respective language are taken into account where possible.
 - Improved the rules for provider names: unnecessary restrictions from earlier versions have been removed. You can now use emojis in your provider names when you like.
\ No newline at end of file