diff --git a/src/gui_2.py b/src/gui_2.py
index b6e4d55..d383da5 100644
--- a/src/gui_2.py
+++ b/src/gui_2.py
@@ -1053,18 +1053,17 @@ class App:
    
    #region: AI Settings
    if self.show_windows.get("AI Settings", False):
-    exp, opened = imgui.begin("AI Settings", self.show_windows["AI Settings"])
-    self.show_windows["AI Settings"] = bool(opened)
-    if exp:
-     self._render_persona_selector_panel()
-     if imgui.collapsing_header("Provider & Model"):
-      self._render_provider_panel()
-     if imgui.collapsing_header("System Prompts"):
-      self._render_system_prompts_panel()
-     if imgui.collapsing_header("RAG Settings"):
-      self._render_rag_panel()
-     self._render_agent_tools_panel()
-    imgui.end()
+    with imgui_window("AI Settings", self.show_windows["AI Settings"]) as (exp, opened):
+     self.show_windows["AI Settings"] = bool(opened)
+     if exp:
+      self._render_persona_selector_panel()
+      if imgui.collapsing_header("Provider & Model"):
+       self._render_provider_panel()
+      if imgui.collapsing_header("System Prompts"):
+       self._render_system_prompts_panel()
+      if imgui.collapsing_header("RAG Settings"):
+       self._render_rag_panel()
+      self._render_agent_tools_panel()
    if self.ui_separate_usage_analytics and self.show_windows.get("Usage Analytics", False):
     exp, opened = imgui.begin("Usage Analytics", self.show_windows["Usage Analytics"])
     self.show_windows["Usage Analytics"] = bool(opened)