diff --git a/frontend/src/lib/components/workspaceSettings/AddDataTableWizard.svelte b/frontend/src/lib/components/workspaceSettings/AddDataTableWizard.svelte
index 5e1769b4eb..3a226b1550 100644
--- a/frontend/src/lib/components/workspaceSettings/AddDataTableWizard.svelte
+++ b/frontend/src/lib/components/workspaceSettings/AddDataTableWizard.svelte
@@ -40,7 +40,8 @@
 	import Alert from '../common/alert/Alert.svelte'
 	import TextInput from '../text_input/TextInput.svelte'
 	import ResourcePicker from '../ResourcePicker.svelte'
-	import Select from '../select/Select.svelte'
+	import Path from '../Path.svelte'
+	import Label from '../Label.svelte'
 	import SupabaseIcon from '../icons/SupabaseIcon.svelte'
 	import { FolderService, OauthService, WorkspaceService } from '$lib/gen'
 	import type { ListCustomInstanceDbsResponse } from '$lib/gen'
@@ -116,6 +117,8 @@
 	let rowCreated = $state(false)
 	/** Why the session pooler could not be used, once something has tried to read it. */
 	let poolerUnavailable: string | undefined = $state(undefined)
+	let initialResourcePath = $state('')
+	let resourcePathError = $state('')
 
 	let folders: string[] = $state([])
 
@@ -230,6 +233,9 @@
 
 	function enterReview() {
 		if (!wiz.review.resourceName) wiz.review.resourceName = suggestedResourceName()
+		// Path seeds itself from initialPath, so it has to be the suggestion as it stood when
+		// the step opened, not a live view of it -- a moving initialPath fights the typing.
+		initialResourcePath = resourcePathOf(wiz)
 		wiz.step = 3
 	}
 
@@ -332,7 +338,7 @@
 		// Held while the dialog is up so a second dismissal cannot stack another one.
 		preventClose = true
 		const confirmed = await confirmationModal.ask({
-			title: 'Leave without adding a database?',
+			title: 'Leave without adding a data table?',
 			children: 'Nothing has been created yet, and what you have filled in here will be lost.',
 			confirmationText: 'Discard'
 		})
@@ -394,19 +400,15 @@
 				wiz.provider === 'supabase' && wiz.supabase.mode === 'create'
 					? 'Create project and data table'
 					: 'Create data table',
-			disabled: !wiz.review.name.trim() || nameTaken || !wiz.review.resourceName.trim(),
+			disabled:
+				!wiz.review.name.trim() ||
+				nameTaken ||
+				!wiz.review.resourceName.trim() ||
+				!!resourcePathError,
 			act: finish
 		}
 	})
 
-	let folderItems = $derived([
-		{
-			label: `Only me (u/${$userStore?.username ?? 'admin'})`,
-			value: `u/${$userStore?.username ?? 'admin'}`
-		},
-		...folders.map((f) => ({ label: `Anyone with access to f/${f}`, value: `f/${f}` }))
-	])
-
 	/** The review step only mints a resource when the wizard is the one creating it. */
 	let mintsResource = $derived(
 		wiz.provider === 'supabase' || (wiz.provider === 'resource' && wiz.own.mode === 'connstr')
@@ -422,7 +424,7 @@
 		}
 	}
 	target="#content"
-	title="Add a database"
+	title="Add a data table"
 	contentClasses="flex flex-col"
 	fixedWidth="md"
 	fixedHeight="lg"
@@ -769,20 +771,30 @@
 	{/if}
 
 	{#if mintsResource}
-		<div class="grid grid-cols-2 gap-2">
-			<div>
-				<span class="text-xs font-semibold text-emphasis">Who can use this database</span>
-				<Select items={folderItems} bind:value={wiz.review.folder} placeholder="Select" />
-			</div>
-			<div>
-				<span class="text-xs font-semibold text-emphasis">Resource name</span>
-				<TextInput bind:value={wiz.review.resourceName} />
-			</div>
-		</div>
-		<p class="text-2xs text-secondary">
-			Saved as a Postgres resource at <span class="font-mono">{resourcePath}</span> — usable in any
-			SQL step{wiz.review.folder.startsWith('u/') ? ', by you only' : ''}.
-		</p>
+		<Label label="Resource path" class="gap-2">
+			<Path
+				bind:path={
+					() => resourcePath,
+					(p) => {
+						const cut = p.lastIndexOf('/')
+						wiz.review.folder = cut > 0 ? p.slice(0, cut) : p
+						wiz.review.resourceName = cut > 0 ? p.slice(cut + 1) : ''
+					}
+				}
+				bind:error={resourcePathError}
+				initialPath={initialResourcePath}
+				namePlaceholder="database"
+				kind="resource"
+				autofocus={false}
+			/>
+			<p class="text-2xs text-secondary">
+				The connection is saved here as a Postgres resource, with its password in a secret variable
+				beside it. Every script in the workspace can use
+				<span class="font-mono">datatable://{wiz.review.name.trim()}</span> wherever you put it — the
+				folder decides who can see and edit the connection itself, and who can reference the resource
+				directly in a SQL step.
+			</p>
+		</Label>
 	{/if}
 
 	{#if sharesDatabaseWith}
diff --git a/frontend/src/lib/components/workspaceSettings/DataTableSettings.svelte b/frontend/src/lib/components/workspaceSettings/DataTableSettings.svelte
index 124edd9776..1694183aa4 100644
--- a/frontend/src/lib/components/workspaceSettings/DataTableSettings.svelte
+++ b/frontend/src/lib/components/workspaceSettings/DataTableSettings.svelte
@@ -288,9 +288,7 @@
 			<Row>
 				<Cell colspan={tableHeadNames.length} class="py-8">
 					<div class="flex flex-col items-center gap-3 text-center">
-						<div class="w-9 h-9 rounded-lg bg-surface-secondary border grid place-items-center">
-							<Database size={18} class="text-secondary" />
-						</div>
+						<Database size={24} class="text-secondary" />
 						<div class="flex flex-col gap-1 items-center">
 							<span class="font-semibold text-sm">No data table yet</span>
 							<p class="text-xs text-secondary max-w-sm">
@@ -303,7 +301,7 @@
 							</p>
 						</div>
 						<Button size="sm" variant="accent" on:click={() => (wizardOpen = true)}>
-							Add a database
+							Add a data table
 						</Button>
 					</div>
 				</Cell>
@@ -424,7 +422,7 @@
 							variant="default"
 							on:click={() => (wizardOpen = true)}
 						>
-							<Plus /> Add a database
+							<Plus /> Add a data table
 						</Button>
 					</div>
 				</Cell>
diff --git a/frontend/src/lib/components/workspaceSettings/addDataTableModel.ts b/frontend/src/lib/components/workspaceSettings/addDataTableModel.ts
index 7e56d2875f..e1b9b70c55 100644
--- a/frontend/src/lib/components/workspaceSettings/addDataTableModel.ts
+++ b/frontend/src/lib/components/workspaceSettings/addDataTableModel.ts
@@ -1,5 +1,5 @@
 /**
- * Everything the "add a database" wizard collects, and the one function that acts on it.
+ * Everything the "add a data table" wizard collects, and the one function that acts on it.
  *
  * The wizard writes nothing until the user finishes: steps 1 and 2 gather intent, step 3
  * reviews it, and `runSetup` performs it. That ordering is what lets the review step show