diff --git a/README.md b/README.md
index 1ec598c..663dbb7 100644
--- a/README.md
+++ b/README.md
@@ -1362,3 +1362,5 @@ MIT License
 - 업데이트: 2026-04-06 21:54 (KST)
 - AX Agent 테마 팔레트를 다시 분리해 `Claude`, `Codex`, `Slate`, `Nord`, `Ember`가 서로 더 다른 인상으로 보이게 조정했습니다. 특히 `Codex`는 웜 베이지를 걷고 더 차갑고 중성적인 회백/차콜 표면 계열로 재구성했습니다.
 - 입력창 포커스 시 거의 항상 주황 테두리처럼 보이던 경로를 제거하고, 각 테마의 `InputFocusBorderColor`를 따르도록 바꿨습니다. 같이 composer와 메시지 버블 라운딩도 더 둥글게 손봐 Codex 계열 박스 감각에 더 가깝게 맞췄습니다.
+- 업데이트: 2026-04-06 22:01 (KST)
+- AX Agent 내부 설정의 코드/공통 기능 토글들이 눌러도 다시 원래 상태로 돌아가던 문제를 수정했습니다. 내부 설정 오버레이에서 `Code 결과 검토`, `코드 리뷰 도구 활성화`, `도구 병렬 실행`, `Worktree/Team/Cron 도구`를 포함한 기능 토글들이 이제 즉시 저장 루틴을 타도록 연결했습니다.
diff --git a/docs/DEVELOPMENT.md b/docs/DEVELOPMENT.md
index ab4bca7..455f626 100644
--- a/docs/DEVELOPMENT.md
+++ b/docs/DEVELOPMENT.md
@@ -5040,3 +5040,8 @@ ow + toggle ?쒓컖 ?몄뼱濡??ㅼ떆 ?뺣젹?덈떎.
   - `AgentClaw*`, `AgentSlate*`, `AgentNord*`, `AgentEmber*`에는 공통 `InputFocusBorderColor` 리소스를 추가해 포커스 테두리가 테마별 성격을 따르도록 통일
 - [ChatWindow.xaml](/E:/AX%20Copilot%20-%20Codex/src/AxCopilot/Views/ChatWindow.xaml)의 composer shell 라운딩을 키우고, [ChatWindow.xaml.cs](/E:/AX%20Copilot%20-%20Codex/src/AxCopilot/Views/ChatWindow.xaml.cs)에서 입력창 포커스 시 `AccentColor` 대신 `InputFocusBorderColor`를 사용하도록 변경했다.
 - [ChatWindow.MessageBubblePresentation.cs](/E:/AX%20Copilot%20-%20Codex/src/AxCopilot/Views/ChatWindow.MessageBubblePresentation.cs)의 사용자/assistant 버블 코너 반경도 확대해, 전반적인 채팅 박스 인상이 더 부드럽고 테마별 표면 차이를 잘 받도록 정리했다.
+## 2026-04-06 22:01 (KST)
+
+- [ChatWindow.xaml](/E:/AX%20Copilot%20-%20Codex/src/AxCopilot/Views/ChatWindow.xaml)의 AX Agent 내부 설정 오버레이 토글들에 `Checked/Unchecked` 이벤트 연결을 복원했다.
+  - 대상: 이미지 입력, proactive compact, skill/tool hooks, cowork/code 검토, 병렬 도구, project rules, agent memory, worktree/team/cron 도구
+- [ChatWindow.xaml.cs](/E:/AX%20Copilot%20-%20Codex/src/AxCopilot/Views/ChatWindow.xaml.cs)에 `ChkOverlayFeatureToggle_Changed(...)` 공통 저장 핸들러를 추가해, 토글 변경 즉시 `ApplyOverlaySettingsChanges(...)`를 타고 설정이 저장되도록 정리했다.
diff --git a/src/AxCopilot/Views/ChatWindow.xaml b/src/AxCopilot/Views/ChatWindow.xaml
index 17dc2e7..8d63ca4 100644
--- a/src/AxCopilot/Views/ChatWindow.xaml
+++ b/src/AxCopilot/Views/ChatWindow.xaml
@@ -3701,10 +3701,12 @@
                                                                    TextWrapping="Wrap"
                                                                    Foreground="{DynamicResource SecondaryText}"/>
                                                     </StackPanel>
-                                                    <CheckBox x:Name="ChkOverlayEnableImageInput"
-                                                              Grid.Column="1"
-                                                              VerticalAlignment="Center"
-                                                              Style="{StaticResource ToggleSwitch}"/>
+                                                        <CheckBox x:Name="ChkOverlayEnableImageInput"
+                                                                  Grid.Column="1"
+                                                                  VerticalAlignment="Center"
+                                                                  Style="{StaticResource ToggleSwitch}"
+                                                                  Checked="ChkOverlayFeatureToggle_Changed"
+                                                                  Unchecked="ChkOverlayFeatureToggle_Changed"/>
                                                 </Grid>
                                             </Border>
                                             <Grid x:Name="OverlayTlsRow" Visibility="Collapsed" Margin="0,0,0,0">
@@ -4455,7 +4457,9 @@
                                                         <CheckBox x:Name="ChkOverlayEnableProactiveCompact"
                                                                   Grid.Column="1"
                                                                   VerticalAlignment="Center"
-                                                                  Style="{StaticResource ToggleSwitch}"/>
+                                                                  Style="{StaticResource ToggleSwitch}"
+                                                                  Checked="ChkOverlayFeatureToggle_Changed"
+                                                                  Unchecked="ChkOverlayFeatureToggle_Changed"/>
                                                     </Grid>
                                                 </Border>
                                                 <Border x:Name="OverlayToggleSkillSystem" Style="{StaticResource OverlayAdvancedToggleRowStyle}">
@@ -4497,7 +4501,9 @@
                                                         <CheckBox x:Name="ChkOverlayEnableSkillSystem"
                                                                   Grid.Column="1"
                                                                   VerticalAlignment="Center"
-                                                                  Style="{StaticResource ToggleSwitch}"/>
+                                                                  Style="{StaticResource ToggleSwitch}"
+                                                                  Checked="ChkOverlayFeatureToggle_Changed"
+                                                                  Unchecked="ChkOverlayFeatureToggle_Changed"/>
                                                     </Grid>
                                                 </Border>
                                                 <Border x:Name="OverlayToggleToolHooks" Style="{StaticResource OverlayAdvancedToggleRowStyle}">
@@ -4539,7 +4545,9 @@
                                                         <CheckBox x:Name="ChkOverlayEnableToolHooks"
                                                                   Grid.Column="1"
                                                                   VerticalAlignment="Center"
-                                                                  Style="{StaticResource ToggleSwitch}"/>
+                                                                  Style="{StaticResource ToggleSwitch}"
+                                                                  Checked="ChkOverlayFeatureToggle_Changed"
+                                                                  Unchecked="ChkOverlayFeatureToggle_Changed"/>
                                                     </Grid>
                                                 </Border>
                                                 <Border x:Name="OverlayToggleHookInputMutation" Style="{StaticResource OverlayAdvancedToggleRowStyle}">
@@ -4581,7 +4589,9 @@
                                                         <CheckBox x:Name="ChkOverlayEnableHookInputMutation"
                                                                   Grid.Column="1"
                                                                   VerticalAlignment="Center"
-                                                                  Style="{StaticResource ToggleSwitch}"/>
+                                                                  Style="{StaticResource ToggleSwitch}"
+                                                                  Checked="ChkOverlayFeatureToggle_Changed"
+                                                                  Unchecked="ChkOverlayFeatureToggle_Changed"/>
                                                     </Grid>
                                                 </Border>
                                                 <Border x:Name="OverlayToggleHookPermissionUpdate" Style="{StaticResource OverlayAdvancedToggleRowStyle}">
@@ -4623,7 +4633,9 @@
                                                         <CheckBox x:Name="ChkOverlayEnableHookPermissionUpdate"
                                                                   Grid.Column="1"
                                                                   VerticalAlignment="Center"
-                                                                  Style="{StaticResource ToggleSwitch}"/>
+                                                                  Style="{StaticResource ToggleSwitch}"
+                                                                  Checked="ChkOverlayFeatureToggle_Changed"
+                                                                  Unchecked="ChkOverlayFeatureToggle_Changed"/>
                                                     </Grid>
                                                 </Border>
                                                 <Border x:Name="OverlayToggleCoworkVerification" Style="{StaticResource OverlayAdvancedToggleRowStyle}">
@@ -4665,7 +4677,9 @@
                                                         <CheckBox x:Name="ChkOverlayEnableCoworkVerification"
                                                                   Grid.Column="1"
                                                                   VerticalAlignment="Center"
-                                                                  Style="{StaticResource ToggleSwitch}"/>
+                                                                  Style="{StaticResource ToggleSwitch}"
+                                                                  Checked="ChkOverlayFeatureToggle_Changed"
+                                                                  Unchecked="ChkOverlayFeatureToggle_Changed"/>
                                                     </Grid>
                                                 </Border>
                                                 <Border x:Name="OverlayToggleCodeVerification" Style="{StaticResource OverlayAdvancedToggleRowStyle}">
@@ -4707,7 +4721,9 @@
                                                         <CheckBox x:Name="ChkOverlayEnableCodeVerification"
                                                                   Grid.Column="1"
                                                                   VerticalAlignment="Center"
-                                                                  Style="{StaticResource ToggleSwitch}"/>
+                                                                  Style="{StaticResource ToggleSwitch}"
+                                                                  Checked="ChkOverlayFeatureToggle_Changed"
+                                                                  Unchecked="ChkOverlayFeatureToggle_Changed"/>
                                                     </Grid>
                                                 </Border>
                                                 <Border x:Name="OverlayToggleCodeReview" Style="{StaticResource OverlayAdvancedToggleRowStyle}">
@@ -4749,7 +4765,9 @@
                                                         <CheckBox x:Name="ChkOverlayEnableCodeReview"
                                                                   Grid.Column="1"
                                                                   VerticalAlignment="Center"
-                                                                  Style="{StaticResource ToggleSwitch}"/>
+                                                                  Style="{StaticResource ToggleSwitch}"
+                                                                  Checked="ChkOverlayFeatureToggle_Changed"
+                                                                  Unchecked="ChkOverlayFeatureToggle_Changed"/>
                                                     </Grid>
                                                 </Border>
                                                 <Border x:Name="OverlayToggleParallelTools" Style="{StaticResource OverlayAdvancedToggleRowStyle}">
@@ -4791,7 +4809,9 @@
                                                         <CheckBox x:Name="ChkOverlayEnableParallelTools"
                                                                   Grid.Column="1"
                                                                   VerticalAlignment="Center"
-                                                                  Style="{StaticResource ToggleSwitch}"/>
+                                                                  Style="{StaticResource ToggleSwitch}"
+                                                                  Checked="ChkOverlayFeatureToggle_Changed"
+                                                                  Unchecked="ChkOverlayFeatureToggle_Changed"/>
                                                     </Grid>
                                                 </Border>
                                                 <Border x:Name="OverlayToggleProjectRules" Style="{StaticResource OverlayAdvancedToggleRowStyle}">
@@ -4833,7 +4853,9 @@
                                                         <CheckBox x:Name="ChkOverlayEnableProjectRules"
                                                                   Grid.Column="1"
                                                                   VerticalAlignment="Center"
-                                                                  Style="{StaticResource ToggleSwitch}"/>
+                                                                  Style="{StaticResource ToggleSwitch}"
+                                                                  Checked="ChkOverlayFeatureToggle_Changed"
+                                                                  Unchecked="ChkOverlayFeatureToggle_Changed"/>
                                                     </Grid>
                                                 </Border>
                                                 <Border x:Name="OverlayToggleAgentMemory" Style="{StaticResource OverlayAdvancedToggleRowStyle}">
@@ -4875,7 +4897,9 @@
                                                         <CheckBox x:Name="ChkOverlayEnableAgentMemory"
                                                                   Grid.Column="1"
                                                                   VerticalAlignment="Center"
-                                                                  Style="{StaticResource ToggleSwitch}"/>
+                                                                  Style="{StaticResource ToggleSwitch}"
+                                                                  Checked="ChkOverlayFeatureToggle_Changed"
+                                                                  Unchecked="ChkOverlayFeatureToggle_Changed"/>
                                                     </Grid>
                                                 </Border>
                                                 <Border x:Name="OverlayToggleWorktreeTools" Style="{StaticResource OverlayAdvancedToggleRowStyle}">
@@ -4917,7 +4941,9 @@
                                                         <CheckBox x:Name="ChkOverlayEnableWorktreeTools"
                                                                   Grid.Column="1"
                                                                   VerticalAlignment="Center"
-                                                                  Style="{StaticResource ToggleSwitch}"/>
+                                                                  Style="{StaticResource ToggleSwitch}"
+                                                                  Checked="ChkOverlayFeatureToggle_Changed"
+                                                                  Unchecked="ChkOverlayFeatureToggle_Changed"/>
                                                     </Grid>
                                                 </Border>
                                                 <Border x:Name="OverlayToggleTeamTools" Style="{StaticResource OverlayAdvancedToggleRowStyle}">
@@ -4959,7 +4985,9 @@
                                                         <CheckBox x:Name="ChkOverlayEnableTeamTools"
                                                                   Grid.Column="1"
                                                                   VerticalAlignment="Center"
-                                                                  Style="{StaticResource ToggleSwitch}"/>
+                                                                  Style="{StaticResource ToggleSwitch}"
+                                                                  Checked="ChkOverlayFeatureToggle_Changed"
+                                                                  Unchecked="ChkOverlayFeatureToggle_Changed"/>
                                                     </Grid>
                                                 </Border>
                                                 <Border x:Name="OverlayToggleCronTools" Style="{StaticResource OverlayAdvancedToggleRowStyle}">
@@ -5001,7 +5029,9 @@
                                                         <CheckBox x:Name="ChkOverlayEnableCronTools"
                                                                   Grid.Column="1"
                                                                   VerticalAlignment="Center"
-                                                                  Style="{StaticResource ToggleSwitch}"/>
+                                                                  Style="{StaticResource ToggleSwitch}"
+                                                                  Checked="ChkOverlayFeatureToggle_Changed"
+                                                                  Unchecked="ChkOverlayFeatureToggle_Changed"/>
                                                     </Grid>
                                                 </Border>
                                             </StackPanel>
diff --git a/src/AxCopilot/Views/ChatWindow.xaml.cs b/src/AxCopilot/Views/ChatWindow.xaml.cs
index 7e96c0a..a7ee4b5 100644
--- a/src/AxCopilot/Views/ChatWindow.xaml.cs
+++ b/src/AxCopilot/Views/ChatWindow.xaml.cs
@@ -10792,6 +10792,14 @@ public partial class ChatWindow : Window
         PersistOverlaySettingsState(refreshOverlayDeferredInputs: false);
     }
 
+    private void ChkOverlayFeatureToggle_Changed(object sender, RoutedEventArgs e)
+    {
+        if (_isOverlaySettingsSyncing)
+            return;
+
+        ApplyOverlaySettingsChanges(showToast: false, closeOverlay: false);
+    }
+
     private void OverlayNav_Checked(object sender, RoutedEventArgs e)
     {
         if (sender is not RadioButton rb || rb.Tag is not string tag)