diff --git a/apps/tauri/src-tauri/src/lib.rs b/apps/tauri/src-tauri/src/lib.rs
index 8a3ad72..b8b059b 100644
--- a/apps/tauri/src-tauri/src/lib.rs
+++ b/apps/tauri/src-tauri/src/lib.rs
@@ -120,6 +120,9 @@ fn add_workspace(
     state: State<'_, Mutex<AppState>>,
 ) -> Result<(), String> {
     let mut s = lock_state(&state)?;
+    if s.config.workspaces.contains_key(&name) {
+        return Err(format!("A workspace named '{}' already exists", name));
+    }
     let ws = WorkspaceConfig::new(PathBuf::from(&path));
     s.config.add_workspace(name.clone(), ws);
     s.config
@@ -569,6 +572,9 @@ fn add_webdav_workspace(
     state: State<'_, Mutex<AppState>>,
 ) -> Result<(), String> {
     let mut s = lock_state(&state)?;
+    if s.config.workspaces.contains_key(&name) {
+        return Err(format!("A workspace named '{}' already exists", name));
+    }
     let managed_dir = s.app_data_dir.join("workspaces").join(&name);
     std::fs::create_dir_all(&managed_dir).map_err(|e| e.to_string())?;
     TaskRepository::init(managed_dir.clone()).map(|_| ()).map_err(|e| e.to_string())?;
diff --git a/apps/tauri/src/lib/screens/SetupScreen.svelte b/apps/tauri/src/lib/screens/SetupScreen.svelte
index 9ab3658..6976740 100644
--- a/apps/tauri/src/lib/screens/SetupScreen.svelte
+++ b/apps/tauri/src/lib/screens/SetupScreen.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { invoke } from "@tauri-apps/api/core";
+  import { documentDir } from "@tauri-apps/api/path";
   import { open } from "@tauri-apps/plugin-dialog";
   import { app } from "../stores/app.svelte";
   import { getCurrentWindow } from "@tauri-apps/api/window";
@@ -15,9 +16,11 @@
 
   // ── Shared state ──────────────────────────────────────────────────
   let mode = $state<"local" | "webdav" | null>(isMobile ? "webdav" : null);
-  let name = $state("");
+  let name = $state("Onyx");
   let path = $state("");
 
+  documentDir().then((d) => { path = d; }).catch(() => {});
+
   // ── WebDAV state ──────────────────────────────────────────────────
   let webdavUrl = $state("");
   let webdavUser = $state("");
@@ -37,7 +40,7 @@
   let previewLoading = $state(false);
 
   // Create workspace state
-  let createName = $state("");
+  let createName = $state("Onyx");
   let creating = $state(false);
 
   // ── Derived ───────────────────────────────────────────────────────
@@ -157,7 +160,7 @@
   }
 
   function startCreate() {
-    createName = "";
+    createName = "Onyx";
     webdavStep = "create";
   }