diff --git a/app/MindWork AI Studio/Components/ExpansionPanel.razor b/app/MindWork AI Studio/Components/ExpansionPanel.razor
index 3a201894..278207ea 100644
--- a/app/MindWork AI Studio/Components/ExpansionPanel.razor	
+++ b/app/MindWork AI Studio/Components/ExpansionPanel.razor	
@@ -3,6 +3,20 @@
         <div class="d-flex align-center">
             <MudIcon Icon="@this.HeaderIcon" Size="@this.IconSize" Color="@this.IconColor" class="mr-3"/>
             <MudText Typo="Typo.h6">@this.HeaderText</MudText>
+            @if (this.ShowEndButton)
+            {
+                <MudSpacer/>
+                if (!string.IsNullOrWhiteSpace(this.EndButtonTooltip))
+                {
+                    <MudTooltip Text="@this.EndButtonTooltip">
+                        <MudIconButton Icon="@this.EndButtonIcon" Color="@this.EndButtonColor" Size="Size.Medium" OnClick="async () => await this.EndButtonClickAsync()"/>
+                    </MudTooltip>
+                }
+                else
+                {
+                    <MudIconButton Icon="@this.EndButtonIcon" Color="@this.EndButtonColor" Size="Size.Medium" OnClick="async () => await this.EndButtonClickAsync()"/>
+                }
+            }
         </div>
     </TitleContent>
     <ChildContent>
diff --git a/app/MindWork AI Studio/Components/ExpansionPanel.razor.cs b/app/MindWork AI Studio/Components/ExpansionPanel.razor.cs
index 47d8b709..6a8e1d4f 100644
--- a/app/MindWork AI Studio/Components/ExpansionPanel.razor.cs	
+++ b/app/MindWork AI Studio/Components/ExpansionPanel.razor.cs	
@@ -21,4 +21,19 @@ public partial class ExpansionPanel : ComponentBase
 
     [Parameter]
     public bool IsExpanded { get; set; }
+    
+    [Parameter]
+    public bool ShowEndButton { get; set; }
+    
+    [Parameter]
+    public Func<ValueTask> EndButtonClickAsync { get; set; } = () => ValueTask.CompletedTask;
+    
+    [Parameter]
+    public string EndButtonIcon { get; set; } = Icons.Material.Filled.Delete;
+
+    [Parameter]
+    public Color EndButtonColor { get; set; } = Color.Error;
+
+    [Parameter]
+    public string EndButtonTooltip { get; set; } = string.Empty;
 }
\ No newline at end of file