diff --git a/apps/tauri/src/lib/components/ConfirmDialog.svelte b/apps/tauri/src/lib/components/ConfirmDialog.svelte
index 5762ba4..95be2e0 100644
--- a/apps/tauri/src/lib/components/ConfirmDialog.svelte
+++ b/apps/tauri/src/lib/components/ConfirmDialog.svelte
@@ -1,6 +1,43 @@
+<script lang="ts" module>
+  // Shared counter so sibling Escape handlers (e.g. TasksScreen's svelte:window
+  // listener) can tell when a ConfirmDialog is open and defer to it instead of
+  // popping the task-detail view behind the dialog.
+  let openCount = $state(0);
+  export function isConfirmDialogOpen(): boolean {
+    return openCount > 0;
+  }
+</script>
+
 <script lang="ts">
+  import { onMount, onDestroy, tick } from "svelte";
+
   let { message, detail, confirmText = "Confirm", danger = false, onconfirm, oncancel }:
     { message: string; detail?: string; confirmText?: string; danger?: boolean; onconfirm: () => void; oncancel: () => void } = $props();
+
+  let cancelBtn: HTMLButtonElement | undefined = $state();
+
+  function handleGlobalKeydown(e: KeyboardEvent) {
+    if (e.key !== "Escape") return;
+    e.stopPropagation();
+    e.stopImmediatePropagation();
+    e.preventDefault();
+    oncancel();
+  }
+
+  onMount(() => {
+    openCount += 1;
+    // Focus Cancel so Escape/Enter go through the dialog's own keydown handler
+    // (which cancels) instead of leaking to the global svelte:window listener
+    // in TasksScreen (which would pop the task detail view).
+    tick().then(() => cancelBtn?.focus());
+    // Belt-and-suspenders: capture-phase listener dismisses even if focus
+    // didn't land on Cancel (e.g. under test harnesses or headless compositors).
+    window.addEventListener("keydown", handleGlobalKeydown, true);
+  });
+  onDestroy(() => {
+    openCount -= 1;
+    window.removeEventListener("keydown", handleGlobalKeydown, true);
+  });
 </script>
 
 <div
@@ -23,6 +60,7 @@
     {/if}
     <div class="mt-4 flex justify-end gap-2">
       <button
+        bind:this={cancelBtn}
         onclick={oncancel}
         class="rounded-lg px-4 py-2 text-sm hover:bg-black/5 dark:hover:bg-white/10"
       >
diff --git a/apps/tauri/src/lib/components/TaskDetailView.svelte b/apps/tauri/src/lib/components/TaskDetailView.svelte
index 21311b4..39c8571 100644
--- a/apps/tauri/src/lib/components/TaskDetailView.svelte
+++ b/apps/tauri/src/lib/components/TaskDetailView.svelte
@@ -25,6 +25,20 @@
     return () => clearTimeout(saveTimer);
   });
 
+  // Re-sync local editor state when the task prop's content changes from elsewhere
+  // (sync pull, external file edit). Skip the reset while the user is actively
+  // editing an input so we don't clobber in-progress typing.
+  $effect(() => {
+    const incomingTitle = task.title;
+    const incomingDesc = task.description;
+    const active = document.activeElement;
+    const editing = active instanceof HTMLInputElement || active instanceof HTMLTextAreaElement;
+    if (!editing) {
+      if (incomingTitle !== title) title = incomingTitle;
+      if (incomingDesc !== description) description = incomingDesc;
+    }
+  });
+
   let otherLists = $derived(app.lists.filter((l) => l.id !== app.activeListId));
 
   function handleHeaderMouseDown(e: MouseEvent) {
@@ -64,10 +78,12 @@
 
   async function executeDelete() {
     confirmDelete = false;
-    // Cascade: delete subtasks first
-    for (const s of subtasks) await app.deleteTask(s.id);
-    await app.deleteTask(task.id);
-    onback();
+    // Cascade: delete subtasks first. Bail out on first failure so we don't
+    // remove the parent while orphaning subtasks; the error is already surfaced.
+    for (const s of subtasks) {
+      if (!(await app.deleteTask(s.id))) return;
+    }
+    if (await app.deleteTask(task.id)) onback();
   }
 
   function handleMenuClickOutside(e: MouseEvent) {
diff --git a/apps/tauri/src/lib/screens/SetupScreen.svelte b/apps/tauri/src/lib/screens/SetupScreen.svelte
index eb9b1fd..84b9b62 100644
--- a/apps/tauri/src/lib/screens/SetupScreen.svelte
+++ b/apps/tauri/src/lib/screens/SetupScreen.svelte
@@ -71,7 +71,9 @@
     const selected = await open({ directory: true, multiple: false });
     if (!selected) return;
     const folder = selected as string;
-    const parts = folder.replace(/\\/g, "/").split("/");
+    // Strip trailing separators before splitting so a path like "/home/me/Tasks/"
+    // yields "Tasks" instead of an empty tail that falls through to "workspace".
+    const parts = folder.replace(/[\\/]+$/, "").split(/[\\/]/);
     const wsName = parts[parts.length - 1] || "workspace";
     await app.addWorkspace(wsName, folder);
   }
diff --git a/apps/tauri/src/lib/screens/TasksScreen.svelte b/apps/tauri/src/lib/screens/TasksScreen.svelte
index 39c8676..c068cae 100644
--- a/apps/tauri/src/lib/screens/TasksScreen.svelte
+++ b/apps/tauri/src/lib/screens/TasksScreen.svelte
@@ -3,7 +3,7 @@
   import TaskItem from "../components/TaskItem.svelte";
   import TaskDetailView from "../components/TaskDetailView.svelte";
   import NewTaskInput, { newTaskState } from "../components/NewTaskInput.svelte";
-  import ConfirmDialog from "../components/ConfirmDialog.svelte";
+  import ConfirmDialog, { isConfirmDialogOpen } from "../components/ConfirmDialog.svelte";
   import SettingsScreen from "./SettingsScreen.svelte";
   import { getCurrentWindow } from "@tauri-apps/api/window";
   import { platform } from "@tauri-apps/plugin-os";
@@ -18,10 +18,15 @@
   let parentTask = $derived(taskStack.length >= 1 ? app.tasks.find(t => t.id === taskStack[0]) ?? null : null);
   let subtaskDetail = $derived(taskStack.length >= 2 ? app.tasks.find(t => t.id === taskStack[1]) ?? null : null);
 
-  // Clear taskStack when the viewed task no longer exists (e.g. deleted or list switched)
+  // Clear taskStack when the viewed task no longer exists (e.g. deleted or list switched).
+  // Handles both the parent-gone case (clear entirely) and the subtask-gone case
+  // (collapse back to parent detail) so an externally deleted subtask doesn't leave
+  // the slider parked over a blank third panel.
   $effect(() => {
     if (taskStack.length > 0 && !parentTask) {
       taskStack = [];
+    } else if (taskStack.length >= 2 && !subtaskDetail) {
+      taskStack = taskStack.slice(0, 1);
     }
   });
 
@@ -48,6 +53,7 @@
   let showWorkspacePicker = $state(false);
 
   let newListName = $state("");
+  let newListInput = $state<HTMLInputElement | null>(null);
   let showCompleted = $state(false);
   let completedVisible = $state(false);
   let renamingListId = $state<string | null>(null);
@@ -73,6 +79,12 @@
     return () => window.removeEventListener("resize", handleResize);
   });
 
+  // Focus the new-list input when it appears. Svelte's native `autofocus`
+  // attribute is unreliable for conditional blocks, so focus imperatively.
+  $effect(() => {
+    if (showNewList && newListInput) newListInput.focus();
+  });
+
 
   async function handleNewList() {
     if (!newListName.trim()) return;
@@ -128,6 +140,9 @@
 
   function handleKeydown(e: KeyboardEvent) {
     if (e.key !== "Escape") return;
+    // Defer to any open ConfirmDialog — it installs a capture-phase listener
+    // that dismisses itself; we must not also pop the task-detail view behind it.
+    if (isConfirmDialogOpen()) return;
     if (showSettings) { showSettings = false; return; }
     if (taskStack.length > 0) { closeDetail(); return; }
     if (showListMenu) { showListMenu = false; return; }
@@ -367,7 +382,7 @@
     <div class="flex-1 overflow-y-auto py-2">
       {#each app.lists as list (list.id)}
         <button
-          onclick={() => { app.selectList(list.id); taskStack = []; closeDrawer(); }}
+          onclick={() => { app.selectList(list.id); taskStack = []; showCompleted = false; completedVisible = false; closeDrawer(); }}
           class="group flex w-full items-center gap-2 px-5 py-2.5 text-left text-sm hover:bg-black/5 dark:hover:bg-white/10 {list.id === app.activeListId ? 'font-bold' : ''}"
         >
           {#if list.id === app.activeListId}
@@ -388,6 +403,7 @@
           {#if showNewList}
             <div class="flex gap-2 px-1">
               <input
+                bind:this={newListInput}
                 type="text"
                 bind:value={newListName}
                 placeholder="List name"
diff --git a/apps/tauri/src/lib/stores/app.svelte.ts b/apps/tauri/src/lib/stores/app.svelte.ts
index 05fc290..65c7f3c 100644
--- a/apps/tauri/src/lib/stores/app.svelte.ts
+++ b/apps/tauri/src/lib/stores/app.svelte.ts
@@ -95,7 +95,6 @@ let groupedPendingTasks = $derived.by((): TaskGroup[] | null => {
   tomorrow.sort(sortByDue);
 
   const groups: TaskGroup[] = [];
-  if (noDate.length) groups.push({ label: "No Date", tasks: noDate, date: null });
   if (overdue.length) groups.push({ label: "Overdue", tasks: overdue, date: null });
   if (today.length) groups.push({ label: "Today", tasks: today, date: todayStart });
   if (tomorrow.length) groups.push({ label: "Tomorrow", tasks: tomorrow, date: tomorrowStart });
@@ -109,6 +108,8 @@ let groupedPendingTasks = $derived.by((): TaskGroup[] | null => {
     groups.push({ label: date.toLocaleDateString(undefined, opts), tasks, date });
   }
 
+  if (noDate.length) groups.push({ label: "No Date", tasks: noDate, date: null });
+
   return groups;
 });
 
@@ -366,13 +367,15 @@ async function reorderTask(taskId: string, newPosition: number) {
   }
 }
 
-async function deleteTask(taskId: string) {
-  if (!activeListId) return;
+async function deleteTask(taskId: string): Promise<boolean> {
+  if (!activeListId) return false;
   try {
     await invoke("delete_task", { listId: activeListId, taskId });
     tasks = tasks.filter((t) => t.id !== taskId);
+    return true;
   } catch (e) {
     error = String(e);
+    return false;
   }
 }
 
diff --git a/crates/onyx-core/src/webdav.rs b/crates/onyx-core/src/webdav.rs
index abdfe17..eeda50b 100644
--- a/crates/onyx-core/src/webdav.rs
+++ b/crates/onyx-core/src/webdav.rs
@@ -448,12 +448,12 @@ pub fn store_credentials(domain: &str, username: &str, password: &str) -> Result
 
     let user_entry = keyring::Entry::new(&service, "username")
         .map_err(|e| Error::Credential(format!("Failed to create keyring entry: {}", e)))?;
-    user_entry.setpassword(username)
+    user_entry.set_password(username)
         .map_err(|e| Error::Credential(format!("Failed to store username: {}", e)))?;
 
     let pass_entry = keyring::Entry::new(&scoped_service, "password")
         .map_err(|e| Error::Credential(format!("Failed to create keyring entry: {}", e)))?;
-    pass_entry.setpassword(password)
+    pass_entry.set_password(password)
         .map_err(|e| Error::Credential(format!("Failed to store password: {}", e)))?;
 
     // Clean up legacy unscoped password entry if present
@@ -478,18 +478,18 @@ pub fn load_credentials(domain: &str) -> Result<(Zeroizing<String>, Zeroizing<St
     let user_entry = keyring::Entry::new(&service, "username")
         .map_err(|e| Error::Credential(format!("Failed to create keyring entry: {}", e)))?;
 
-    if let Ok(user) = user_entry.getpassword() {
+    if let Ok(user) = user_entry.get_password() {
         // Try scoped password key first (domain+username), fall back to legacy unscoped key
         let scoped_service = format!("com.onyx.webdav.{}::{}", domain, user);
         let found = keyring::Entry::new(&scoped_service, "password")
             .ok()
-            .and_then(|e| e.getpassword().ok())
+            .and_then(|e| e.get_password().ok())
             .map(|p| (p, false))
             .or_else(|| {
                 // Migration fallback: try legacy unscoped password entry
                 keyring::Entry::new(&service, "password")
                     .ok()
-                    .and_then(|e| e.getpassword().ok())
+                    .and_then(|e| e.get_password().ok())
                     .map(|p| (p, true))
             });
 
@@ -497,7 +497,7 @@ pub fn load_credentials(domain: &str) -> Result<(Zeroizing<String>, Zeroizing<St
             // Auto-migrate legacy credentials to scoped format
             if needs_migration {
                 if let Ok(entry) = keyring::Entry::new(&scoped_service, "password") {
-                    let _ = entry.setpassword(&pass);
+                    let _ = entry.set_password(&pass);
                 }
                 if let Ok(legacy) = keyring::Entry::new(&service, "password") {
                     let _ = legacy.delete_credential();
@@ -547,7 +547,7 @@ pub fn delete_credentials(domain: &str) -> Result<()> {
     // Load username first so we can delete the scoped password entry
     let username = keyring::Entry::new(&service, "username")
         .ok()
-        .and_then(|e| e.getpassword().ok());
+        .and_then(|e| e.get_password().ok());
 
     if let Some(user) = &username {
         let scoped_service = format!("com.onyx.webdav.{}::{}", domain, user);
diff --git a/screenshots/smoke-test/09-fix-confirm-before.png b/screenshots/smoke-test/09-fix-confirm-before.png
new file mode 100644
index 0000000..56ebce6
Binary files /dev/null and b/screenshots/smoke-test/09-fix-confirm-before.png differ
diff --git a/screenshots/smoke-test/10-fix-confirm-after-escape.png b/screenshots/smoke-test/10-fix-confirm-after-escape.png
new file mode 100644
index 0000000..24b77d0
Binary files /dev/null and b/screenshots/smoke-test/10-fix-confirm-after-escape.png differ
diff --git a/screenshots/smoke-test/11-fix-orphan-subtask.png b/screenshots/smoke-test/11-fix-orphan-subtask.png
new file mode 100644
index 0000000..676337b
Binary files /dev/null and b/screenshots/smoke-test/11-fix-orphan-subtask.png differ
diff --git a/screenshots/smoke-test/12-fix-newlist-autofocus.png b/screenshots/smoke-test/12-fix-newlist-autofocus.png
new file mode 100644
index 0000000..6e97390
Binary files /dev/null and b/screenshots/smoke-test/12-fix-newlist-autofocus.png differ