diff --git a/ai_software_factory/dashboard_ui.py b/ai_software_factory/dashboard_ui.py
index ff22592..d5e8511 100644
--- a/ai_software_factory/dashboard_ui.py
+++ b/ai_software_factory/dashboard_ui.py
@@ -284,12 +284,12 @@ def create_dashboard():
                         ui.label(str(value)).style('font-size: 2.1rem; font-weight: 800; margin-top: 6px;')
                         ui.label(subtitle).style('font-size: 0.9rem; opacity: 0.78; margin-top: 8px;')
 
-            tabs = ui.tabs().classes('w-full')
-            overview_tab = ui.tab('Overview')
-            projects_tab = ui.tab('Projects')
-            trace_tab = ui.tab('Prompt Trace')
-            system_tab = ui.tab('System')
-            health_tab = ui.tab('Health')
+            with ui.tabs().classes('w-full') as tabs:
+                overview_tab = ui.tab('Overview')
+                projects_tab = ui.tab('Projects')
+                trace_tab = ui.tab('Prompt Trace')
+                system_tab = ui.tab('System')
+                health_tab = ui.tab('Health')
 
             with ui.tab_panels(tabs, value=overview_tab).classes('w-full'):
                 with ui.tab_panel(overview_tab):