diff --git a/app/MindWork AI Studio/Dialogs/ChatTemplateDialog.razor b/app/MindWork AI Studio/Dialogs/ChatTemplateDialog.razor
index d26e1a98..8bd8cb4c 100644
--- a/app/MindWork AI Studio/Dialogs/ChatTemplateDialog.razor	
+++ b/app/MindWork AI Studio/Dialogs/ChatTemplateDialog.razor	
@@ -113,8 +113,9 @@
                     </MudTd>
                 </RowTemplate>
                 <RowEditingTemplate>
-                        <MudSelect Label="Role" @bind-Value="context.Role" Required>
-                            @foreach (var role in availableRoles)
+                    <MudTd>
+                        <MudSelect Label="@T("Role")" @bind-Value="@context.Role" Required="true">
+                            @foreach (var role in ChatRoles.ChatTemplateRoles())
                             {
                                 <MudSelectItem Value="@role">@role.ToChatTemplateName()</MudSelectItem>
                             }
diff --git a/app/MindWork AI Studio/Dialogs/ChatTemplateDialog.razor.cs b/app/MindWork AI Studio/Dialogs/ChatTemplateDialog.razor.cs
index e9ae9a98..e9587a9c 100644
--- a/app/MindWork AI Studio/Dialogs/ChatTemplateDialog.razor.cs	
+++ b/app/MindWork AI Studio/Dialogs/ChatTemplateDialog.razor.cs	
@@ -63,7 +63,6 @@ public partial class ChatTemplateDialog : MSGComponentBase
     private bool isInlineEditOnGoing;
 
     private ContentBlock messageEntryBeforeEdit;
-    private readonly IEnumerable<ChatRole> availableRoles = ChatRoles.ChatTemplateRoles().ToArray();
     
     // We get the form reference from Blazor code to validate it manually:
     private MudForm form = null!;