diff --git a/frontend/src/lib/components/workspaceSettings/CustomInstanceDbSelect.svelte b/frontend/src/lib/components/workspaceSettings/CustomInstanceDbSelect.svelte
index ba7e006132..bd6aed544c 100644
--- a/frontend/src/lib/components/workspaceSettings/CustomInstanceDbSelect.svelte
+++ b/frontend/src/lib/components/workspaceSettings/CustomInstanceDbSelect.svelte
@@ -47,13 +47,21 @@
 <div class="flex relative items-center {className}">
 	<Select
 		class="flex-1"
-		inputClass="pr-20"
 		bind:value
 		onCreateItem={(i) => (value = i)}
 		placeholder="PostgreSQL database name"
 		items={onlySelectedTags}
 		disabled={!$isCustomInstanceDbEnabled}
-	/>
+		itemButtonWrapperClasses="flex items-center justify-between gap-2"
+	>
+		{#snippet endSnippet({ item })}
+			{#if !customInstanceDbs.current?.[item.value]?.success}
+				<div class="w-1.5 h-1.5 rounded-full bg-red-400"></div>
+			{:else}
+				<div class="w-1.5 h-1.5 rounded-full bg-green-400"></div>
+			{/if}
+		{/snippet}
+	</Select>
 
 	<Button
 		spacingSize="xs2"
diff --git a/frontend/src/lib/components/workspaceSettings/CustomInstanceDbWizardModal.svelte b/frontend/src/lib/components/workspaceSettings/CustomInstanceDbWizardModal.svelte
index da9598f20e..23b47b61f9 100644
--- a/frontend/src/lib/components/workspaceSettings/CustomInstanceDbWizardModal.svelte
+++ b/frontend/src/lib/components/workspaceSettings/CustomInstanceDbWizardModal.svelte
@@ -19,6 +19,7 @@
 	import type DBManagerDrawer from '../DBManagerDrawer.svelte'
 	import { ArrowRight } from 'lucide-svelte'
 	import type { Snippet } from 'svelte'
+	import { truncate } from '$lib/utils'
 
 	type Props = {
 		customInstanceDbs: ResourceReturn<GetCustomInstanceDbsResponse>
@@ -184,7 +185,7 @@
 					{:else if status?.error}
 						Try again
 					{:else}
-						Setup {dbname}
+						Setup {truncate(dbname, 24)}
 					{/if}
 				</Button>
 			</div>