diff --git a/apps/desktop/src/components/diff/SchemaDiffOptionsPanel.vue b/apps/desktop/src/components/diff/SchemaDiffOptionsPanel.vue
index ca2f830945..1230d20f21 100644
--- a/apps/desktop/src/components/diff/SchemaDiffOptionsPanel.vue
+++ b/apps/desktop/src/components/diff/SchemaDiffOptionsPanel.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, watch } from "vue";
+import { ref } from "vue";
 import { useI18n } from "vue-i18n";
 import { Button } from "@/components/ui/button";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
@@ -19,18 +19,10 @@ const emit = defineEmits<{
 
 const { t } = useI18n();
 
-// Local copy of options
+// The panel is a transactional editor: it is recreated each time it opens and
+// only commits its local snapshot when the user clicks Done.
 const localOptions = ref<SchemaDiffCompareOptions>(normalizeSchemaDiffCompareOptions(props.options));
 
-// Watch for external changes
-watch(
-  () => props.options,
-  (newOptions) => {
-    localOptions.value = normalizeSchemaDiffCompareOptions(newOptions);
-  },
-  { deep: true },
-);
-
 function isChecked(id: BooleanSchemaDiffCompareOptionKey): boolean {
   return !!localOptions.value[id];
 }
diff --git a/apps/desktop/src/components/diff/__tests__/SchemaDiffOptionsPanel.spec.ts b/apps/desktop/src/components/diff/__tests__/SchemaDiffOptionsPanel.spec.ts
new file mode 100644
index 0000000000..2225d3a321
--- /dev/null
+++ b/apps/desktop/src/components/diff/__tests__/SchemaDiffOptionsPanel.spec.ts
@@ -0,0 +1,93 @@
+// @vitest-environment happy-dom
+
+import { createApp, defineComponent, h, nextTick, ref, type App } from "vue";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { DEFAULT_POSTGRES_OPTIONS, type SchemaDiffCompareOptions, type SchemaDiffOptionItem } from "@/types/schemaDiff";
+
+vi.mock("vue-i18n", () => ({ useI18n: () => ({ t: (key: string) => key }) }));
+
+vi.mock("@/components/ui/button", async () => {
+  const { defineComponent, h } = await import("vue");
+  return {
+    Button: defineComponent({
+      inheritAttrs: false,
+      setup(_props, { attrs, slots }) {
+        return () => h("button", attrs, slots.default?.());
+      },
+    }),
+  };
+});
+
+vi.mock("@/components/ui/select", async () => {
+  const { defineComponent, h } = await import("vue");
+  const passthrough = defineComponent({
+    setup(_props, { slots }) {
+      return () => h("div", slots.default?.());
+    },
+  });
+  return { Select: passthrough, SelectContent: passthrough, SelectItem: passthrough, SelectTrigger: passthrough, SelectValue: passthrough };
+});
+
+vi.mock("@/components/ui/tooltip", async () => {
+  const { defineComponent, h } = await import("vue");
+  return {
+    HelpTooltip: defineComponent({
+      setup(_props, { slots }) {
+        return () => h("div", slots.default?.());
+      },
+    }),
+  };
+});
+
+import SchemaDiffOptionsPanel from "@/components/diff/SchemaDiffOptionsPanel.vue";
+
+const mountedApps: App[] = [];
+
+afterEach(() => {
+  for (const app of mountedApps.splice(0)) app.unmount();
+  document.body.innerHTML = "";
+});
+
+describe("SchemaDiffOptionsPanel", () => {
+  it("keeps unsaved checkbox edits when the parent refreshes equivalent options", async () => {
+    const options = ref<SchemaDiffCompareOptions>({ ...DEFAULT_POSTGRES_OPTIONS });
+    const optionTree: SchemaDiffOptionItem[] = [{ id: "views", labelKey: "views", defaultChecked: true }];
+    const updates: SchemaDiffCompareOptions[] = [];
+    const host = document.createElement("div");
+    document.body.append(host);
+
+    const app = createApp(
+      defineComponent({
+        setup() {
+          return () =>
+            h(SchemaDiffOptionsPanel, {
+              options: options.value,
+              optionTree,
+              "onUpdate:options": (value: SchemaDiffCompareOptions) => updates.push(value),
+            });
+        },
+      }),
+    );
+    mountedApps.push(app);
+    app.mount(host);
+    await nextTick();
+
+    const optionLabel = Array.from(host.querySelectorAll("span")).find((element) => element.textContent === "views");
+    const optionRow = optionLabel?.parentElement as HTMLElement;
+    expect(optionRow.querySelector("svg")).not.toBeNull();
+
+    optionRow.click();
+    await nextTick();
+    expect(optionRow.querySelector("svg")).toBeNull();
+
+    options.value = { ...options.value };
+    await nextTick();
+    expect(optionRow.querySelector("svg")).toBeNull();
+
+    const doneButton = Array.from(host.querySelectorAll("button")).find((button) => button.textContent?.includes("common.done"));
+    doneButton?.click();
+    await nextTick();
+    expect(updates).toHaveLength(1);
+    expect(updates[0].views).toBe(false);
+  });
+});