diff --git a/apps/desktop/src/features/editor/BacklinksPane.tsx b/apps/desktop/src/features/editor/BacklinksPane.tsx
index a2c5122..2b80e2f 100644
--- a/apps/desktop/src/features/editor/BacklinksPane.tsx
+++ b/apps/desktop/src/features/editor/BacklinksPane.tsx
@@ -35,7 +35,7 @@ export default function BacklinksPane({ vaultPath, targetRelPath, onOpenNote }:
 
   return (
     <aside
-      className="flex w-64 flex-col border-l border-gray-800 bg-gray-950"
+      className="flex h-full min-h-0 w-64 shrink-0 flex-col border-l border-gray-800 bg-gray-950"
       aria-label="Backlinks"
     >
       <div className="border-b border-gray-800 p-3 font-medium text-gray-300">Backlinks</div>
diff --git a/apps/desktop/src/routes/Home.tsx b/apps/desktop/src/routes/Home.tsx
index 7325f04..778e813 100644
--- a/apps/desktop/src/routes/Home.tsx
+++ b/apps/desktop/src/routes/Home.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useMemo, useState, useRef, useCallback } from "react";
 import { CodeMirrorEditor } from "@trachyte/editor";
 import {
   DiskAdapter,
@@ -26,16 +26,23 @@ export default function Home() {
   const [content, setContent] = useState("");
   const [indexer, setIndexer] = useState<Indexer | null>(null);
 
+  type SaveStatus = "idle" | "saving" | "saved" | "error";
+  const [saveStatus, setSaveStatus] = useState<SaveStatus>("idle");
+
   const manager = useMemo(() => new VaultManager(new DiskAdapter(tauriDriver)), []);
   const reloader = useMemo(() => new ExternalChangeReloader(manager.events, 100), [manager]);
   const [doctorOpen, setDoctorOpen] = useState(false);
   const [paletteOpen, setPaletteOpen] = useState(false);
   const [scrollToPos, setScrollToPos] = useState<{ from: number; to: number } | null>(null);
 
+  const saveTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const lastSavedContentRef = useRef(content);
+
   const linkIndex = useMemo(
     () => new Map(notes.map((n) => [n.replace(/\.md$/i, ""), `Notes/${n}`])),
     [notes],
   );
+
   async function openVault() {
     const raw = inputPath.trim();
     if (!raw) return;
@@ -53,6 +60,7 @@ export default function Home() {
     }
     setCurrentRel(null);
     setContent("");
+    lastSavedContentRef.current = "";
     const idx = new Indexer({
       fs: manager.getAdapter(),
       index: tauriIndexDriver,
@@ -65,24 +73,77 @@ export default function Home() {
   }
 
   async function openNote(rel: string, blockId?: string) {
-    if (openedVault === null) return;
+    if (openedVault === null) {
+      return;
+    }
     setCurrentRel(rel);
-    const text = await manager.getAdapter().readFile(joinPath(openedVault, rel));
-    setContent(text);
-    reloader.watch(rel);
-
-    if (blockId) {
-      const pos = findBlockPosition(text, blockId);
-      if (pos !== null) {
-        setScrollToPos({ from: pos, to: pos });
+    const fullPath = joinPath(openedVault, rel);
+    try {
+      const text = await manager.getAdapter().readFile(fullPath);
+      setContent(text);
+      lastSavedContentRef.current = text;
+      reloader.watch(rel);
+
+      if (blockId) {
+        const pos = findBlockPosition(text, blockId);
+        if (pos !== null) {
+          setScrollToPos({ from: pos, to: pos });
+        } else {
+          setScrollToPos(null);
+        }
       } else {
         setScrollToPos(null);
       }
-    } else {
-      setScrollToPos(null);
+    } catch (e) {
+      console.error("[DEBUG] readFile error:", e);
+      throw e;
     }
   }
 
+  const save = useCallback(async () => {
+    if (!openedVault || !currentRel) return;
+    setSaveStatus("saving");
+    try {
+      await manager.getAdapter().writeFile(joinPath(openedVault, currentRel), content);
+      lastSavedContentRef.current = content;
+      setSaveStatus("saved");
+      setTimeout(() => setSaveStatus("idle"), 2000);
+    } catch {
+      setSaveStatus("error");
+    }
+  }, [openedVault, currentRel, content, manager]);
+
+  useEffect(() => {
+    if (!openedVault || !currentRel) return;
+    const interval = 1000;
+    if (interval <= 0) return;
+    if (content !== lastSavedContentRef.current) {
+      if (saveTimeoutRef.current) clearTimeout(saveTimeoutRef.current);
+      setSaveStatus("saving");
+      saveTimeoutRef.current = setTimeout(save, interval);
+    }
+    return () => {
+      if (saveTimeoutRef.current) clearTimeout(saveTimeoutRef.current);
+    };
+  }, [content, openedVault, currentRel, save]);
+
+  useEffect(() => {
+    if (!openedVault) return;
+    const unsubscribe = manager.events.on((event) => {
+      if (
+        event.type === "file:created" ||
+        event.type === "file:deleted" ||
+        event.type === "file:renamed"
+      ) {
+        void (async () => {
+          const list = await manager.list();
+          setNotes(list);
+        })();
+      }
+    });
+    return () => unsubscribe();
+  }, [manager, openedVault]);
+
   useEffect(() => {
     let disposed = false;
     let unlisten: (() => void) | null = null;
@@ -109,6 +170,7 @@ export default function Home() {
       if (rel !== currentRel) return;
       const text = await manager.getAdapter().readFile(joinPath(openedVault, rel));
       setContent(text);
+      lastSavedContentRef.current = text;
     });
   }, [reloader, manager, openedVault, currentRel]);
 
@@ -117,6 +179,7 @@ export default function Home() {
     return () => reloader.dispose();
   }, [reloader]);
 
+  // Global keydown: Ctrl+Shift+D (doctor), Ctrl+Shift+F (search), Ctrl+S (save)
   useEffect(() => {
     function onKeyDown(e: KeyboardEvent) {
       if (e.ctrlKey && e.shiftKey && e.key.toLowerCase() === "d") {
@@ -127,41 +190,19 @@ export default function Home() {
         e.preventDefault();
         setPaletteOpen((v) => !v);
       }
+      if (e.ctrlKey && e.key.toLowerCase() === "s") {
+        e.preventDefault();
+        void save();
+      }
     }
     window.addEventListener("keydown", onKeyDown);
     return () => window.removeEventListener("keydown", onKeyDown);
-  }, []);
-
-  // useEffect(() => {
-  //   function onKeyDown(e: KeyboardEvent) {
-  //     if (e.ctrlKey && e.shiftKey && e.key.toLowerCase() === "d") {
-  //       e.preventDefault();
-  //       setDoctorOpen((v) => !v);
-  //     }
-  //   }
-  //   window.addEventListener("keydown", onKeyDown);
-  //   return () => window.removeEventListener("keydown", onKeyDown);
-  // }, []);
+  }, [save]);
 
   useEffect(() => {
     return () => indexer?.dispose();
   }, [indexer]);
 
-  // useEffect(() => {
-  //   function onKeyDown(e: KeyboardEvent) {
-  //     if (e.ctrlKey && e.shiftKey && e.key.toLowerCase() === "d") {
-  //       e.preventDefault();
-  //       setDoctorOpen((v) => !v);
-  //     }
-  //     if (e.ctrlKey && e.shiftKey && e.key.toLowerCase() === "f") {
-  //       e.preventDefault();
-  //       setPaletteOpen((v) => !v);
-  //     }
-  //   }
-  //   window.addEventListener("keydown", onKeyDown);
-  //   return () => window.removeEventListener("keydown", onKeyDown);
-  // }, []);
-
   return (
     <div className="flex h-screen bg-gray-900 text-white">
       <aside className="flex w-72 shrink-0 flex-col border-r border-gray-800 p-4">
@@ -199,7 +240,9 @@ export default function Home() {
                 className={`w-full rounded px-2 py-1 text-left text-sm hover:bg-gray-800 ${
                   currentRel === `Notes/${name}` ? "bg-gray-800 text-blue-300" : "text-gray-200"
                 }`}
-                onClick={() => void openNote(`Notes/${name}`)}
+                onClick={() => {
+                  void openNote(name);
+                }}
               >
                 {name}
               </button>
@@ -207,26 +250,34 @@ export default function Home() {
           ))}
         </ul>
       </aside>
-      <main className="relative flex-1 overflow-hidden">
+      <main className="relative flex h-full min-w-0 flex-1 flex-row overflow-hidden">
         {currentRel === null ? (
-          <div className="flex h-full items-center justify-center text-gray-500">
+          <div className="flex h-full min-w-0 flex-1 items-center justify-center text-gray-500">
             Open a note to start editing
           </div>
         ) : (
-          <CodeMirrorEditor
-            value={content}
-            onChange={setContent}
-            links={linkIndex}
-            onOpenLink={(path, blockId) => void openNote(path, blockId)}
-            scrollToPos={scrollToPos}
-          />
-        )}
-        {currentRel && (
-          <BacklinksPane
-            vaultPath={openedVault!}
-            targetRelPath={currentRel}
-            onOpenNote={(path) => void openNote(path)}
-          />
+          <>
+            <div className="relative min-w-0 flex-1">
+              <CodeMirrorEditor
+                value={content}
+                onChange={setContent}
+                links={linkIndex}
+                onOpenLink={(path, blockId) => void openNote(path, blockId)}
+                scrollToPos={scrollToPos}
+              />
+              {/* Save status indicator */}
+              <div className="absolute top-2 right-2 rounded bg-gray-800 px-2 py-1 text-xs">
+                {saveStatus === "saving" && "Saving…"}
+                {saveStatus === "saved" && "Saved"}
+                {saveStatus === "error" && <span className="text-red-400">Save failed</span>}
+              </div>
+            </div>
+            <BacklinksPane
+              vaultPath={openedVault!}
+              targetRelPath={currentRel}
+              onOpenNote={(path) => void openNote(path)}
+            />
+          </>
         )}
       </main>
       {doctorOpen && openedVault !== null && (
diff --git a/packages/core/src/doctor/__tests__/doctor.spec.ts b/packages/core/src/doctor/__tests__/doctor.spec.ts
index 16190dc..2c9a0e6 100644
--- a/packages/core/src/doctor/__tests__/doctor.spec.ts
+++ b/packages/core/src/doctor/__tests__/doctor.spec.ts
@@ -31,7 +31,7 @@ describe("settingsValidity", () => {
     const raw = JSON.stringify({
       schema_version: "1",
       theme: "light",
-      editor: { fontSize: 14, lineWrapping: true },
+      editor: { fontSize: 14, lineWrapping: true, autoSaveInterval: 1000 },
     });
     expect(settingsValidity(raw)).toEqual({ exists: true, valid: true, schemaVersion: "1" });
   });
@@ -60,7 +60,7 @@ describe("buildDoctorReport", () => {
       JSON.stringify({
         schema_version: "1",
         theme: "dark",
-        editor: { fontSize: 14, lineWrapping: true },
+        editor: { fontSize: 14, lineWrapping: true, autoSaveInterval: 1000 },
       }),
     );
     expect(report.schemaVersion).toBeNull();
diff --git a/packages/core/src/doctor/doctor.ts b/packages/core/src/doctor/doctor.ts
index c5abff0..7c29d35 100644
--- a/packages/core/src/doctor/doctor.ts
+++ b/packages/core/src/doctor/doctor.ts
@@ -1,4 +1,5 @@
-import { DEFAULT_SETTINGS, isSettings } from "../settings/schema.js";
+import { DEFAULT_SETTINGS } from "../settings/schema.js";
+import { normalizeSettings } from "../settings/settings.js";
 import type { DoctorSettingsValidity, DoctorReport, DoctorVaultReport } from "./types.js";
 
 export function settingsValidity(raw: string | null): DoctorSettingsValidity {
@@ -11,10 +12,12 @@ export function settingsValidity(raw: string | null): DoctorSettingsValidity {
   } catch {
     return { exists: true, valid: false };
   }
-  if (!isSettings(parsed) || parsed.schema_version !== DEFAULT_SETTINGS.schema_version) {
+  // Normalize first - adds missing editor.autoSaveInterval from defaults
+  const normalized = normalizeSettings(parsed);
+  if (!normalized || normalized.schema_version !== DEFAULT_SETTINGS.schema_version) {
     return { exists: true, valid: false };
   }
-  return { exists: true, valid: true, schemaVersion: parsed.schema_version };
+  return { exists: true, valid: true, schemaVersion: normalized.schema_version };
 }
 
 export function buildDoctorReport(
diff --git a/packages/core/src/settings/__tests__/settings.spec.ts b/packages/core/src/settings/__tests__/settings.spec.ts
index dd1e4d3..d940d95 100644
--- a/packages/core/src/settings/__tests__/settings.spec.ts
+++ b/packages/core/src/settings/__tests__/settings.spec.ts
@@ -12,7 +12,7 @@ describe("SettingsService", () => {
     const custom: Settings = {
       schema_version: "1",
       theme: "light",
-      editor: { fontSize: 18, lineWrapping: false },
+      editor: { fontSize: 18, lineWrapping: false, autoSaveInterval: 1000 },
     };
 
     await service.save(custom);
@@ -29,12 +29,12 @@ describe("SettingsService", () => {
     const first: Settings = {
       schema_version: "1",
       theme: "dark",
-      editor: { fontSize: 14, lineWrapping: true },
+      editor: { fontSize: 14, lineWrapping: true, autoSaveInterval: 1000 },
     };
     const second: Settings = {
       schema_version: "1",
       theme: "light",
-      editor: { fontSize: 16, lineWrapping: false },
+      editor: { fontSize: 16, lineWrapping: false, autoSaveInterval: 1000 },
     };
 
     await service.save(first);
@@ -56,7 +56,7 @@ describe("SettingsService", () => {
     const good: Settings = {
       schema_version: "1",
       theme: "light",
-      editor: { fontSize: 20, lineWrapping: true },
+      editor: { fontSize: 20, lineWrapping: true, autoSaveInterval: 1000 },
     };
     await adapter.writeFile("/vault/.trachyte/settings.json.bak", JSON.stringify(good, null, 2));
     await adapter.writeFile("/vault/.trachyte/settings.json", "{ not json !!");
@@ -128,7 +128,7 @@ describe("SettingsService", () => {
     const custom: Settings = {
       schema_version: "1",
       theme: "dark",
-      editor: { fontSize: 14, lineWrapping: true },
+      editor: { fontSize: 14, lineWrapping: true, autoSaveInterval: 1000 },
     };
     await service.save(custom);
 
@@ -153,7 +153,7 @@ describe("SettingsService", () => {
     const custom: Settings = {
       schema_version: "1",
       theme: "light",
-      editor: { fontSize: 12, lineWrapping: false },
+      editor: { fontSize: 12, lineWrapping: false, autoSaveInterval: 1000 },
     };
 
     await service.save(custom);
diff --git a/packages/core/src/settings/schema.ts b/packages/core/src/settings/schema.ts
index 18b6453..feca24f 100644
--- a/packages/core/src/settings/schema.ts
+++ b/packages/core/src/settings/schema.ts
@@ -4,6 +4,7 @@ export interface Settings {
   editor: {
     fontSize: number;
     lineWrapping: boolean;
+    autoSaveInterval: number;
   };
 }
 
@@ -13,6 +14,7 @@ export const DEFAULT_SETTINGS: Settings = {
   editor: {
     fontSize: 14,
     lineWrapping: true,
+    autoSaveInterval: 1000,
   },
 };
 
@@ -26,6 +28,7 @@ export function isSettings(value: unknown): value is Settings {
     typeof editor === "object" &&
     editor !== null &&
     typeof editor.fontSize === "number" &&
-    typeof editor.lineWrapping === "boolean"
+    typeof editor.lineWrapping === "boolean" &&
+    typeof editor.autoSaveInterval === "number"
   );
 }
diff --git a/packages/core/src/settings/settings.ts b/packages/core/src/settings/settings.ts
index 26cbd59..70eb96a 100644
--- a/packages/core/src/settings/settings.ts
+++ b/packages/core/src/settings/settings.ts
@@ -73,7 +73,15 @@ function normalizeSettings(value: unknown): Settings | null {
   if (record.schema_version === undefined) {
     record.schema_version = DEFAULT_SETTINGS.schema_version;
   }
+  const editor = record.editor as Record<string, unknown> | undefined;
+  if (editor) {
+    if (editor.autoSaveInterval === undefined) {
+      editor.autoSaveInterval = DEFAULT_SETTINGS.editor.autoSaveInterval;
+    }
+  }
   if (!isSettings(record)) return null;
   if (record.schema_version !== DEFAULT_SETTINGS.schema_version) return null;
   return record;
 }
+
+export { normalizeSettings };
diff --git a/packages/core/src/vault/__tests__/manager.spec.ts b/packages/core/src/vault/__tests__/manager.spec.ts
index d4a3191..53d83a0 100644
--- a/packages/core/src/vault/__tests__/manager.spec.ts
+++ b/packages/core/src/vault/__tests__/manager.spec.ts
@@ -65,7 +65,7 @@ describe("VaultManager", () => {
     await adapter.writeFile("/vault/Notes/a.md", "a");
     await adapter.writeFile("/vault/Notes/readme.txt", "txt");
 
-    expect(await manager.list()).toEqual(["/vault/Notes/a.md", "/vault/Notes/b.md"]);
+    expect(await manager.list()).toEqual(["Notes/a.md", "Notes/b.md"]);
   });
 
   it("list() throws VaultError when no vault is open", async () => {
@@ -99,6 +99,6 @@ describe("VaultManager", () => {
     await manager.create("/vault");
     await store.writeFile("/vault/Notes/welcome.md", "# Hello");
 
-    expect(await manager.list()).toEqual(["/vault/Notes/welcome.md"]);
+    expect(await manager.list()).toEqual(["Notes/welcome.md"]);
   });
 });
diff --git a/packages/core/src/vault/manager.ts b/packages/core/src/vault/manager.ts
index 19f5f55..b37b5a8 100644
--- a/packages/core/src/vault/manager.ts
+++ b/packages/core/src/vault/manager.ts
@@ -84,7 +84,12 @@ export class VaultManager {
     if (this.currentVault === null) {
       throw new VaultError("No vault open");
     }
-    const entries = await this.adapter.listFiles(joinPath(this.currentVault, "Notes"));
-    return entries.filter((e) => e.endsWith(".md")).sort();
+    const notesDir = joinPath(this.currentVault, "Notes");
+    const entries = await this.adapter.listFiles(notesDir);
+    const mdFiles = entries.filter((e) => e.endsWith(".md")).sort();
+    return mdFiles.map((fullPath) => {
+      const relative = fullPath.replace(notesDir + "/", "");
+      return `Notes/${relative}`;
+    });
   }
 }
diff --git a/packages/editor/src/CodeMirrorEditor.tsx b/packages/editor/src/CodeMirrorEditor.tsx
index e5e1981..51677a1 100644
--- a/packages/editor/src/CodeMirrorEditor.tsx
+++ b/packages/editor/src/CodeMirrorEditor.tsx
@@ -20,6 +20,7 @@ export function CodeMirrorEditor({ value, onChange, links, onOpenLink, scrollToP
   const onChangeRef = useRef(onChange);
   const linksRef = useRef(links ?? new Map<string, string>());
   const onOpenLinkRef = useRef(onOpenLink);
+  const isInternalChangeRef = useRef(false);
 
   useEffect(() => {
     onChangeRef.current = onChange;
@@ -49,7 +50,12 @@ export function CodeMirrorEditor({ value, onChange, links, onOpenLink, scrollToP
           blockRefs(),
           EditorView.updateListener.of((update: ViewUpdate) => {
             if (update.docChanged) {
+              isInternalChangeRef.current = true;
               onChangeRef.current?.(update.state.doc.toString());
+
+              setTimeout(() => {
+                isInternalChangeRef.current = false;
+              }, 0);
             }
           }),
         ],
@@ -68,17 +74,20 @@ export function CodeMirrorEditor({ value, onChange, links, onOpenLink, scrollToP
 
   useEffect(() => {
     const view = viewRef.current;
-    if (view && value !== view.state.doc.toString()) {
+
+    if (!view) return;
+    if (isInternalChangeRef.current) return;
+
+    if (value !== view.state.doc.toString()) {
       view.dispatch({ changes: { from: 0, to: view.state.doc.length, insert: value } });
     }
-    // NEW: handle scrollTo after content is set
-    if (view && scrollToPosRef.current) {
+    if (scrollToPosRef.current) {
       view.dispatch({
         selection: { anchor: scrollToPosRef.current.from, head: scrollToPosRef.current.to },
         scrollIntoView: true,
       });
     }
-  }, [value]);
+  }, [value, scrollToPos]);
 
   return <div ref={editorRef} className="h-full w-full" />;
 }