diff --git a/ui/src/pages/CompanySkills.production.tsx b/ui/src/pages/CompanySkills.production.tsx
index cc0ebc79c10..1579df556fc 100644
--- a/ui/src/pages/CompanySkills.production.tsx
+++ b/ui/src/pages/CompanySkills.production.tsx
@@ -2987,7 +2987,7 @@ export function SkillDetailPage({
 
   // Track unsaved edits so we can float a save bar and warn before the page is
   // unloaded with a dirty draft (PAP-10907 J).
-  const savedFileContent = file?.content ?? "";
+  const savedFileContent = file?.markdown ? splitFrontmatter(file.content).body : file?.content ?? "";
   const isDirty = editMode && Boolean(file?.editable) && draft !== savedFileContent;
   useEffect(() => {
     if (!isDirty) return;
@@ -3086,7 +3086,7 @@ export function SkillDetailPage({
                 editMode ? (
                   <>
                     <Button variant="ghost" size="sm" onClick={() => setEditMode(false)} disabled={savePending}>Cancel</Button>
-                    <Button size="sm" onClick={onSave} disabled={savePending}>
+                    <Button size="sm" onClick={onSave} disabled={savePending || !isDirty}>
                       <Save className="mr-1.5 h-3.5 w-3.5" />
                       {savePending ? "Saving..." : "Save"}
                     </Button>
diff --git a/ui/src/pages/CompanySkills.test.tsx b/ui/src/pages/CompanySkills.test.tsx
index dc9798d06b5..f10fcc72e88 100644
--- a/ui/src/pages/CompanySkills.test.tsx
+++ b/ui/src/pages/CompanySkills.test.tsx
@@ -23,6 +23,7 @@ import { CompanySkills as ProductionCompanySkills } from "./CompanySkills.produc
 import { queryKeys } from "../lib/queryKeys";
 
 const readVersion = vi.hoisted(() => vi.fn());
+const editorRoute = vi.hoisted(() => ({ path: undefined as string | undefined, search: "" }));
 const mockCompanySkillsApi = vi.hoisted(() => ({
   version: readVersion,
   list: vi.fn(),
@@ -34,6 +35,7 @@ const mockCompanySkillsApi = vi.hoisted(() => ({
   catalogDetail: vi.fn(),
   catalogFile: vi.fn(),
   browseProject: vi.fn(),
+  updateFile: vi.fn(),
 }));
 const mockFoldersApi = vi.hoisted(() => ({ list: vi.fn() }));
 const mockAgentsApi = vi.hoisted(() => ({ list: vi.fn() }));
@@ -63,8 +65,8 @@ vi.mock("@/lib/router", () => ({
     <a href={to} {...props}>{children}</a>
   ),
   useNavigate: () => vi.fn(),
-  useParams: () => ({}),
-  useSearchParams: () => [new URLSearchParams(), vi.fn()],
+  useParams: () => ({ "*": editorRoute.path }),
+  useSearchParams: () => [new URLSearchParams(editorRoute.search), vi.fn()],
 }));
 
 vi.mock("@/components/ui/button", () => ({
@@ -134,7 +136,7 @@ vi.mock("../components/MarkdownBody", () => ({
 }));
 
 vi.mock("../components/MarkdownEditor", () => ({
-  MarkdownEditor: ({ value }: { value: string }) => <textarea readOnly value={value} />,
+  MarkdownEditor: ({ value, onChange }: { value: string; onChange: (value: string) => void }) => <textarea aria-label="Skill markdown" value={value} onInput={event => onChange(event.currentTarget.value)} onChange={() => {}} />,
 }));
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -151,6 +153,8 @@ async function act(callback: () => void | Promise<void>) {
 }
 
 afterEach(() => {
+  editorRoute.path = undefined;
+  editorRoute.search = "";
   root?.unmount();
   root = null;
   queryClient?.clear();
@@ -1278,6 +1282,62 @@ describe("CompanySkills page read resilience", () => {
     vi.unstubAllGlobals();
   });
 
+  describe.each([["current", CompanySkills], ["production", ProductionCompanySkills]] as const)("%s file editor baseline", (_name, Page) => {
+    it("opens frontmatter markdown clean without an editor change, preserves edits and resets selection", async () => {
+      const frontmatter = "---\nname: demo-skill\ndescription: Keep this metadata.\ncustom: stable\n---\n\n";
+      const body = "# Demo Skill\n\nOriginal body.\n";
+      const content = frontmatter + body;
+      const detail = makeDetail(makeVersion(1, content));
+      detail.fileInventory.push({ path: "references/notes.md", kind: "reference" });
+      editorRoute.path = "demo-skill";
+      editorRoute.search = "tab=files";
+      const files: Record<string, string> = { "SKILL.md": content, "references/notes.md": "Reference body.\n" };
+      const readFile = (path: string) => ({ path, content: files[path], markdown: true, editable: true, encoding: "utf-8" });
+      mockCompanySkillsApi.detail.mockResolvedValue(detail);
+      mockCompanySkillsApi.file.mockImplementation(async (_company, _skill, path) => readFile(path));
+      mockCompanySkillsApi.versions.mockResolvedValue([]);
+      mockCompanySkillsApi.updateStatus.mockResolvedValue({ supported: false });
+      mockCompanySkillsApi.updateFile.mockReset().mockImplementation(async (_company, _skill, path, next) => {
+        files[path] = next;
+        return readFile(path);
+      });
+      const node = await renderPage(Page);
+      await vi.waitFor(() => expect(buttonsNamed(node, "Edit")).toHaveLength(1));
+      await click(buttonsNamed(node, "Edit")[0]!);
+      expect(node.textContent).not.toContain("Unsaved changes");
+      expect((buttonsNamed(node, "Save")[0] as HTMLButtonElement).disabled).toBe(true);
+      const editor = () => node.querySelector<HTMLTextAreaElement>('[aria-label="Skill markdown"]')!;
+      expect(editor().value).toBe(body);
+      expect(mockCompanySkillsApi.updateFile).not.toHaveBeenCalled();
+      const change = async (value: string) => act(() => {
+        Object.getOwnPropertyDescriptor(HTMLTextAreaElement.prototype, "value")!.set!.call(editor(), value);
+        editor().dispatchEvent(new Event("input", { bubbles: true }));
+      });
+      await change(body + "A real edit.\n");
+      expect(node.textContent).toContain("Unsaved changes");
+      expect((buttonsNamed(node, "Save")[0] as HTMLButtonElement).disabled).toBe(false);
+      await click(buttonsNamed(node, "Discard")[0]!);
+      await click(buttonsNamed(node, "Edit")[0]!);
+      expect(editor().value).toBe(body);
+      expect(node.textContent).not.toContain("Unsaved changes");
+      await change(body + "Saved edit.\n");
+      await click(buttonsNamed(node, "Save")[0]!);
+      await vi.waitFor(() => expect(mockCompanySkillsApi.updateFile).toHaveBeenCalledWith("company-1", "skill-1", "SKILL.md", frontmatter + body + "Saved edit.\n"));
+      expect(detail.description).toBe("A demo skill.");
+      await settle();
+      await click(buttonsNamed(node, "Edit")[0]!);
+      await change(body + "Unsaved prior-file edit.\n");
+      editorRoute.path = "demo-skill/files/references/notes.md";
+      await act(() => root?.render(<QueryClientProvider client={queryClient}><Page /></QueryClientProvider>));
+      await settle();
+      await click(buttonsNamed(node, "Edit")[0]!);
+      expect(editor().value).toBe("Reference body.\n");
+      expect(node.textContent).not.toContain("Unsaved changes");
+      expect((buttonsNamed(node, "Save")[0] as HTMLButtonElement).disabled).toBe(true);
+      expect(mockCompanySkillsApi.updateFile).toHaveBeenCalledTimes(1);
+    });
+  });
+
   describe.each([["current", CompanySkills], ["production", ProductionCompanySkills]] as const)("%s discovery errors", (_name, Page) => {
     it.each([["skills", 403], ["skills", 429], ["catalog", 403], ["catalog", 429]] as const)(
       "shows a %s %s failure while the other read pauses and keeps its own Retry usable",
diff --git a/ui/src/pages/CompanySkills.tsx b/ui/src/pages/CompanySkills.tsx
index f9fb4d68473..05e68aa9786 100644
--- a/ui/src/pages/CompanySkills.tsx
+++ b/ui/src/pages/CompanySkills.tsx
@@ -2897,7 +2897,7 @@ export function SkillDetailPage({
 
   // Track unsaved edits so we can float a save bar and warn before the page is
   // unloaded with a dirty draft (PAP-10907 J).
-  const savedFileContent = file?.content ?? "";
+  const savedFileContent = file?.markdown ? splitFrontmatter(file.content).body : file?.content ?? "";
   const isDirty = editMode && Boolean(file?.editable) && draft !== savedFileContent;
   useEffect(() => {
     if (!isDirty) return;
@@ -3001,7 +3001,7 @@ export function SkillDetailPage({
                 editMode ? (
                   <>
                     <Button variant="ghost" size="sm" onClick={() => setEditMode(false)} disabled={savePending}>Cancel</Button>
-                    <Button size="sm" onClick={onSave} disabled={savePending}>
+                    <Button size="sm" onClick={onSave} disabled={savePending || !isDirty}>
                       <Save className="mr-1.5 h-3.5 w-3.5" />
                       {savePending ? "Saving..." : "Save"}
                     </Button>