diff --git a/frontend/src/lib/components/ResourceEditor.svelte b/frontend/src/lib/components/ResourceEditor.svelte
index baca88f16c..6ce0c492a3 100644
--- a/frontend/src/lib/components/ResourceEditor.svelte
+++ b/frontend/src/lib/components/ResourceEditor.svelte
@@ -291,10 +291,9 @@
 					<h5 class="mt-4 inline-flex items-center gap-4 pb-2">
 						File content ({resourceTypeInfo.format_extension})
 					</h5>
-					<div class="h-full w-full border p-1 rounded">
+					<div class="">
 						<SimpleEditor
 							autoHeight
-							class="editor"
 							lang={resourceTypeInfo.format_extension}
 							bind:code={textFileContent}
 							fixedOverflowWidgets={false}
@@ -324,14 +323,8 @@
 				{#if !emptyString(jsonError)}<span class="text-red-400 text-xs mb-1 flex flex-row-reverse"
 						>{jsonError}</span
 					>{:else}<div class="py-2"></div>{/if}
-				<div class="h-full w-full border p-1 rounded">
-					<SimpleEditor
-						autoHeight
-						class="editor"
-						lang="json"
-						bind:code={rawCode}
-						fixedOverflowWidgets={false}
-					/>
+				<div class="bg-surface-secondary rounded-md border py-2.5">
+					<SimpleEditor autoHeight lang="json" bind:code={rawCode} />
 				</div>
 			{/if}
 		</div>
diff --git a/frontend/src/lib/components/schema/EditableSchemaDrawer.svelte b/frontend/src/lib/components/schema/EditableSchemaDrawer.svelte
index 1e0180a189..cea82e7dfe 100644
--- a/frontend/src/lib/components/schema/EditableSchemaDrawer.svelte
+++ b/frontend/src/lib/components/schema/EditableSchemaDrawer.svelte
@@ -223,24 +223,25 @@
 		{/snippet}
 	</Drawer>
 {:else}
-	<div class="mt-2"></div>
-	<SimpleEditor
-		bind:this={editor}
-		small
-		fixedOverflowWidgets={false}
-		on:change={() => {
-			try {
-				schema = JSON.parse(schemaString)
-				error = ''
-			} catch (err) {
-				error = err.message
-			}
-		}}
-		bind:code={schemaString}
-		lang="json"
-		autoHeight
-		automaticLayout
-	/>
+	<div class="mt-2 bg-surface-secondary rounded-md border py-2.5">
+		<SimpleEditor
+			bind:this={editor}
+			small
+			fixedOverflowWidgets={false}
+			on:change={() => {
+				try {
+					schema = JSON.parse(schemaString)
+					error = ''
+				} catch (err) {
+					error = err.message
+				}
+			}}
+			bind:code={schemaString}
+			lang="json"
+			autoHeight
+			automaticLayout
+		/>
+	</div>
 	{#if !emptyString(error)}
 		<div class="text-red-400 text-xs">{error}</div>
 	{:else}
diff --git a/frontend/src/lib/components/schema/FlowPropertyEditor.svelte b/frontend/src/lib/components/schema/FlowPropertyEditor.svelte
index dd676dd99a..f1aea70a63 100644
--- a/frontend/src/lib/components/schema/FlowPropertyEditor.svelte
+++ b/frontend/src/lib/components/schema/FlowPropertyEditor.svelte
@@ -77,6 +77,12 @@
 
 	let oneOfSelected: string | undefined = $state(oneOf?.[0]?.title)
 
+	$effect(() => {
+		if (oneOf?.length && !oneOfSelected) {
+			oneOfSelected = oneOf[0].title
+		}
+	})
+
 	const dispatch = createEventDispatcher()
 
 	function getResourceTypesFromFormat(format: string | undefined): string[] {