diff --git a/frontend/src/lib/components/ArgInput.svelte b/frontend/src/lib/components/ArgInput.svelte
index a3b4b801ae..41bc117cae 100644
--- a/frontend/src/lib/components/ArgInput.svelte
+++ b/frontend/src/lib/components/ArgInput.svelte
@@ -475,7 +475,7 @@
 			{:else if inputCat == 'resource-object' && resourceTypes == undefined}
 				<span class="text-2xs text-tertiary">Loading resource types...</span>
 			{:else if inputCat == 'resource-object' && (resourceTypes == undefined || (format.split('-').length > 1 && resourceTypes.includes(format.substring('resource-'.length))))}
-				<ObjectResourceInput {disablePortal} {format} bind:value {showSchemaExplorer} />
+				<ObjectResourceInput selectFirst {disablePortal} {format} bind:value {showSchemaExplorer} />
 			{:else if inputCat == 'resource-object' && format.split('-').length > 1 && format
 					.replace('resource-', '')
 					.replace('_', '')
@@ -598,6 +598,7 @@
 				</div>
 			{:else if inputCat == 'resource-string'}
 				<ResourcePicker
+					selectFirst
 					{disablePortal}
 					bind:value
 					resourceType={format && format.split('-').length > 1
diff --git a/frontend/src/lib/components/ObjectResourceInput.svelte b/frontend/src/lib/components/ObjectResourceInput.svelte
index 5c3c0659d1..327bc42a28 100644
--- a/frontend/src/lib/components/ObjectResourceInput.svelte
+++ b/frontend/src/lib/components/ObjectResourceInput.svelte
@@ -6,6 +6,7 @@
 	export let value: any
 	export let disablePortal = false
 	export let showSchemaExplorer = false
+	export let selectFirst = false
 
 	function isString(value: any) {
 		return typeof value === 'string' || value instanceof String
@@ -39,6 +40,7 @@
 		<S3ObjectPicker bind:value />
 	{:else}
 		<ResourcePicker
+			{selectFirst}
 			{disablePortal}
 			on:change={(e) => {
 				path = e.detail
diff --git a/frontend/src/lib/components/ResourcePicker.svelte b/frontend/src/lib/components/ResourcePicker.svelte
index 45b459b28c..3a752e2c58 100644
--- a/frontend/src/lib/components/ResourcePicker.svelte
+++ b/frontend/src/lib/components/ResourcePicker.svelte
@@ -19,6 +19,7 @@
 	export let resourceType: string | undefined = undefined
 	export let disablePortal = false
 	export let showSchemaExplorer = false
+	export let selectFirst = false
 
 	let valueSelect =
 		initialValue || value
@@ -29,7 +30,7 @@
 			  }
 			: undefined
 
-	let collection = [valueSelect]
+	let collection = valueSelect ? [valueSelect] : []
 
 	async function loadResources(resourceType: string | undefined) {
 		const nc = (
@@ -50,6 +51,12 @@
 			nc.push({ value: value ?? initialValue!, label: value ?? initialValue!, type: '' })
 		}
 		collection = nc
+		console.log('collection', selectFirst)
+		if (collection.length == 1 && selectFirst && valueSelect == undefined) {
+			value = collection[0].value
+			valueType = collection[0].type
+			valueSelect = collection[0]
+		}
 	}
 
 	$: {