diff --git a/frontend/src/lib/components/DBSchemaExplorer.svelte b/frontend/src/lib/components/DBSchemaExplorer.svelte
index 6c95786a5d..0a3c18e22b 100644
--- a/frontend/src/lib/components/DBSchemaExplorer.svelte
+++ b/frontend/src/lib/components/DBSchemaExplorer.svelte
@@ -95,7 +95,7 @@
 			{#if dbSchema.lang === 'graphql'}
 				<GraphqlSchemaViewer code={formatGraphqlSchema(dbSchema)} class="h-full" />
 			{:else}
-				<ObjectViewer json={formatSchema(dbSchema)} pureViewer />
+				<ObjectViewer json={formatSchema(dbSchema)} pureViewer collapseLevel={1} />
 			{/if}
 		</DrawerContent>
 	</Drawer>
diff --git a/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte b/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
index 13c088b3cd..2518c62396 100644
--- a/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
+++ b/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
@@ -20,6 +20,7 @@
 	export let topBrackets = false
 	export let topLevelNode = false
 	export let allowCopy = true
+	export let collapseLevel: number | undefined = undefined
 
 	let s3FileViewer: S3FilePicker
 
@@ -101,6 +102,8 @@
 								{pureViewer}
 								{allowCopy}
 								on:select
+								{collapseLevel}
+								collapsed={collapseLevel !== undefined ? level + 1 >= collapseLevel : undefined}
 							/>
 						{:else}
 							<button