diff --git a/package.json b/package.json
index 37cec07..dfc2738 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "docs:build": "vitepress build docs",
     "docs:preview": "vitepress preview docs --host 0.0.0.0 --port 4173 --strictPort",
     "test:config": "pnpm run build && node --test dist/config/config.test.js",
-    "test:core": "pnpm run build && node --test dist/cli/args.test.js dist/cli/help.test.js dist/core/services/cli-command-service.test.js dist/core/services/numeric-shortcut-session-service.test.js dist/core/services/secondary-subtitle-service.test.js dist/core/services/mpv-render-metrics-service.test.js dist/core/services/mpv-runtime-service.test.js dist/core/services/runtime-options-runtime-service.test.js",
+    "test:core": "pnpm run build && node --test dist/cli/args.test.js dist/cli/help.test.js dist/core/services/cli-command-service.test.js dist/core/services/numeric-shortcut-session-service.test.js dist/core/services/secondary-subtitle-service.test.js dist/core/services/mpv-render-metrics-service.test.js dist/core/services/mpv-runtime-service.test.js dist/core/services/runtime-options-runtime-service.test.js dist/core/services/overlay-modal-restore-service.test.js",
     "test:subtitle": "pnpm run build && node --test dist/subtitle/stages.test.js dist/subtitle/pipeline.test.js",
     "generate:config-example": "pnpm run build && node dist/generate-config-example.js",
     "start": "pnpm run build && electron . --start",
diff --git a/src/core/services/overlay-modal-restore-service.test.ts b/src/core/services/overlay-modal-restore-service.test.ts
new file mode 100644
index 0000000..89762ba
--- /dev/null
+++ b/src/core/services/overlay-modal-restore-service.test.ts
@@ -0,0 +1,30 @@
+import test from "node:test";
+import assert from "node:assert/strict";
+import {
+  addOverlayModalRestoreFlagService,
+  handleOverlayModalClosedService,
+} from "./overlay-modal-restore-service";
+
+test("overlay modal restore service adds modal restore flag", () => {
+  const restore = new Set<"runtime-options" | "subsync">();
+  addOverlayModalRestoreFlagService(restore, "runtime-options");
+  assert.equal(restore.has("runtime-options"), true);
+});
+
+test("overlay modal restore service hides overlay only when last modal closes", () => {
+  const restore = new Set<"runtime-options" | "subsync">();
+  const visibility: boolean[] = [];
+
+  addOverlayModalRestoreFlagService(restore, "runtime-options");
+  addOverlayModalRestoreFlagService(restore, "subsync");
+
+  handleOverlayModalClosedService(restore, "runtime-options", (visible) => {
+    visibility.push(visible);
+  });
+  assert.equal(visibility.length, 0);
+
+  handleOverlayModalClosedService(restore, "subsync", (visible) => {
+    visibility.push(visible);
+  });
+  assert.deepEqual(visibility, [false]);
+});
diff --git a/src/core/services/overlay-modal-restore-service.ts b/src/core/services/overlay-modal-restore-service.ts
new file mode 100644
index 0000000..1630ce9
--- /dev/null
+++ b/src/core/services/overlay-modal-restore-service.ts
@@ -0,0 +1,18 @@
+export function addOverlayModalRestoreFlagService<T extends string>(
+  restoreSet: Set<T>,
+  modal: T,
+): void {
+  restoreSet.add(modal);
+}
+
+export function handleOverlayModalClosedService<T extends string>(
+  restoreSet: Set<T>,
+  modal: T,
+  setVisibleOverlayVisible: (visible: boolean) => void,
+): void {
+  if (!restoreSet.has(modal)) return;
+  restoreSet.delete(modal);
+  if (restoreSet.size === 0) {
+    setVisibleOverlayVisible(false);
+  }
+}
diff --git a/src/main.ts b/src/main.ts
index dbf5554..333a735 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -180,6 +180,10 @@ import {
   handleMpvCommandFromIpcService,
 } from "./core/services/ipc-command-service";
 import { sendToVisibleOverlayService } from "./core/services/overlay-send-service";
+import {
+  addOverlayModalRestoreFlagService,
+  handleOverlayModalClosedService,
+} from "./core/services/overlay-modal-restore-service";
 import {
   runSubsyncManualFromIpcRuntimeService,
   triggerSubsyncFromConfigRuntimeService,
@@ -1118,7 +1122,13 @@ function toggleVisibleOverlay(): void { setVisibleOverlayVisible(!visibleOverlay
 function toggleInvisibleOverlay(): void { setInvisibleOverlayVisible(!invisibleOverlayVisible); }
 function setOverlayVisible(visible: boolean): void { setVisibleOverlayVisible(visible); }
 function toggleOverlay(): void { toggleVisibleOverlay(); }
-function handleOverlayModalClosed(modal: OverlayHostedModal): void { if (!restoreVisibleOverlayOnModalClose.has(modal)) return; restoreVisibleOverlayOnModalClose.delete(modal); if (restoreVisibleOverlayOnModalClose.size === 0) { setVisibleOverlayVisible(false); } }
+function handleOverlayModalClosed(modal: OverlayHostedModal): void {
+  handleOverlayModalClosedService(
+    restoreVisibleOverlayOnModalClose,
+    modal,
+    (visible) => setVisibleOverlayVisible(visible),
+  );
+}
 
 function handleMpvCommandFromIpc(command: (string | number)[]): void {
   handleMpvCommandFromIpcService(command, {
@@ -1214,7 +1224,7 @@ registerIpcHandlersService({
  */
 function createFieldGroupingCallback() { return createFieldGroupingCallbackService({ getVisibleOverlayVisible: () => visibleOverlayVisible, getInvisibleOverlayVisible: () => invisibleOverlayVisible, setVisibleOverlayVisible: (visible) => setVisibleOverlayVisible(visible), setInvisibleOverlayVisible: (visible) => setInvisibleOverlayVisible(visible), getResolver: () => fieldGroupingResolver, setResolver: (resolver) => { fieldGroupingResolver = resolver; }, sendRequestToVisibleOverlay: (data) => sendToVisibleOverlay("kiku:field-grouping-request", data) }); }
 
-function sendToVisibleOverlay(channel: string, payload?: unknown, options?: { restoreOnModalClose?: OverlayHostedModal }): boolean { return sendToVisibleOverlayService({ mainWindow, visibleOverlayVisible, setVisibleOverlayVisible: (visible) => setVisibleOverlayVisible(visible), channel, payload, restoreOnModalClose: options?.restoreOnModalClose, addRestoreFlag: (modal) => restoreVisibleOverlayOnModalClose.add(modal as OverlayHostedModal) }); }
+function sendToVisibleOverlay(channel: string, payload?: unknown, options?: { restoreOnModalClose?: OverlayHostedModal }): boolean { return sendToVisibleOverlayService({ mainWindow, visibleOverlayVisible, setVisibleOverlayVisible: (visible) => setVisibleOverlayVisible(visible), channel, payload, restoreOnModalClose: options?.restoreOnModalClose, addRestoreFlag: (modal) => addOverlayModalRestoreFlagService(restoreVisibleOverlayOnModalClose, modal as OverlayHostedModal) }); }
 
 registerAnkiJimakuIpcRuntimeService({
   patchAnkiConnectEnabled: (enabled) => { configService.patchRawConfig({ ankiConnect: { enabled } }); },