diff --git a/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor b/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor
index b3692712..65fb656b 100644
--- a/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor	
+++ b/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor	
@@ -5,7 +5,8 @@
     @for (var contextIndex = 0; contextIndex < this.codingContexts.Count; contextIndex++)
     {
         var codingContext = this.codingContexts[contextIndex];
-        <ExpansionPanel HeaderText="@codingContext.Id" HeaderIcon="@Icons.Material.Filled.Code">
+        var index = contextIndex;
+        <ExpansionPanel HeaderText="@codingContext.Id" HeaderIcon="@Icons.Material.Filled.Code" ShowEndButton="@true" EndButtonColor="Color.Error" EndButtonIcon="@Icons.Material.Filled.Delete" EndButtonTooltip="Delete context" EndButtonClickAsync="@(() => this.DeleteContext(index))">
             <CodingContextItem @bind-CodingContext="@codingContext"/>
         </ExpansionPanel>
     }
diff --git a/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor.cs b/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor.cs
index 660ae8f0..52c10e40 100644
--- a/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor.cs	
@@ -105,6 +105,18 @@ public partial class AssistantCoding : AssistantBaseCore
         });
     }
 
+    private ValueTask DeleteContext(int index)
+    {
+        if(this.codingContexts.Count < index + 1)
+            return ValueTask.CompletedTask;
+
+        this.codingContexts.RemoveAt(index);
+        this.form?.ResetValidation();
+
+        this.StateHasChanged();
+        return ValueTask.CompletedTask;
+    }
+
     private async Task GetSupport()
     {
         await this.form!.Validate();
diff --git a/app/MindWork AI Studio/wwwroot/changelog/v0.8.12.md b/app/MindWork AI Studio/wwwroot/changelog/v0.8.12.md
index 7c6177a2..c42e0d36 100644
--- a/app/MindWork AI Studio/wwwroot/changelog/v0.8.12.md	
+++ b/app/MindWork AI Studio/wwwroot/changelog/v0.8.12.md	
@@ -1,6 +1,7 @@
 # v0.8.12, build 174
 - Added an e-mail writing assistant.
 - Added the possibility to preselect some e-mail writing assistant options.
+- Improved the coding assistant by adding a button to delete a context.
 - Improved chat page by scrolling to the bottom after loading (configurable; default is on).
 - Improved all assistants to provide a button to copy their respective result to the clipboard.
 - Improved the content validation for the agenda assistant.