diff --git a/app/MindWork AI Studio/Components/CodeTabs.razor b/app/MindWork AI Studio/Components/CodeTabs.razor
index 0ae667c4..91556682 100644
--- a/app/MindWork AI Studio/Components/CodeTabs.razor	
+++ b/app/MindWork AI Studio/Components/CodeTabs.razor	
@@ -1,4 +1,4 @@
-<MudTabs @bind-ActivePanelIndex="this.SelectedIndex" PanelClass="code-block" MinimumTabWidth="30px" Class="mt-2">
+<MudTabs ActivePanelIndex="this.SelectedIndex" ActivePanelIndexChanged="async idx => await this.TabChanged(idx)" PanelClass="code-block" MinimumTabWidth="30px" Class="mt-2">
     @foreach (var block in this.blocks)
     {
         <MudTabPanel Text="@block.Title">
diff --git a/app/MindWork AI Studio/Components/CodeTabs.razor.cs b/app/MindWork AI Studio/Components/CodeTabs.razor.cs
index cbc579e4..668ee84a 100644
--- a/app/MindWork AI Studio/Components/CodeTabs.razor.cs	
+++ b/app/MindWork AI Studio/Components/CodeTabs.razor.cs	
@@ -10,6 +10,9 @@ public partial class CodeTabs : ComponentBase
     [Parameter]
     public int SelectedIndex { get; set; }
     
+    [Parameter]
+    public EventCallback<int> SelectedIndexChanged { get; set; }
+    
     private readonly List<CodeTabItem> blocks = new();
 
     internal void RegisterBlock(string title, RenderFragment fragment)
@@ -29,4 +32,11 @@ public partial class CodeTabs : ComponentBase
         
         public RenderFragment Fragment { get; init; } = null!;
     }
+
+    private async Task TabChanged(int index)
+    {
+        this.SelectedIndex = index;
+        await this.SelectedIndexChanged.InvokeAsync(index);
+        await this.InvokeAsync(this.StateHasChanged);
+    }
 }
\ No newline at end of file