diff --git a/frontend/src/lib/components/Editor.svelte b/frontend/src/lib/components/Editor.svelte
index d4940fe436..1f5d6c04e0 100644
--- a/frontend/src/lib/components/Editor.svelte
+++ b/frontend/src/lib/components/Editor.svelte
@@ -373,7 +373,7 @@
 
 						const thisTs = Date.now()
 						copilotTs = thisTs
-						await sleep(500)
+						await sleep(200)
 						if (copilotTs === thisTs) {
 							abortController?.abort()
 							abortController = new AbortController()
diff --git a/frontend/src/lib/components/FlowBuilder.svelte b/frontend/src/lib/components/FlowBuilder.svelte
index dd114d94f1..a98ba51f4e 100644
--- a/frontend/src/lib/components/FlowBuilder.svelte
+++ b/frontend/src/lib/components/FlowBuilder.svelte
@@ -659,6 +659,7 @@
 			$copilotDrawerStore?.closeDrawer()
 			select(module.id)
 			await tick()
+			await tick()
 			focusCopilot()
 
 			let isFirstInLoop = false
@@ -675,7 +676,6 @@
 			if (hubScript) {
 				module.editor?.setCode(hubScript.content)
 			} else if (module.source === 'custom') {
-				module.editor?.setCode('')
 				const deltaStore = writable<string>('')
 				const unsubscribe = deltaStore.subscribe(async (delta) => {
 					module.editor?.append(delta)
diff --git a/frontend/src/lib/components/copilot/ScriptGen.svelte b/frontend/src/lib/components/copilot/ScriptGen.svelte
index 04b616b5ae..db260e358b 100644
--- a/frontend/src/lib/components/copilot/ScriptGen.svelte
+++ b/frontend/src/lib/components/copilot/ScriptGen.svelte
@@ -145,6 +145,16 @@
 	}
 
 	$: updateSchema(lang, args, $dbSchemas)
+
+	let codeDiv: HTMLDivElement | undefined
+	let lastScrollHeight = 0
+	function updateScroll() {
+		if (codeDiv && lastScrollHeight !== codeDiv.scrollHeight) {
+			codeDiv.scrollTop = codeDiv.scrollHeight
+			lastScrollHeight = codeDiv.scrollHeight
+		}
+	}
+	$: $generatedCode && updateScroll()
 </script>
 
 {#if genLoading}
@@ -264,7 +274,7 @@
 		</svelte:fragment>
 		<div class="block text-primary">
 			{#if genLoading}
-				<div class="w-[42rem] min-h-[3rem] max-h-[34rem] overflow-y-scroll">
+				<div class="w-[42rem] min-h-[3rem] max-h-[34rem] overflow-y-scroll" bind:this={codeDiv}>
 					{#if $generatedCode.length > 0}
 						<div class="overflow-x-scroll">
 							<HighlightCode language={lang} code={$generatedCode} /></div
diff --git a/frontend/src/lib/components/copilot/lib.ts b/frontend/src/lib/components/copilot/lib.ts
index 5ac987193b..451860e6eb 100644
--- a/frontend/src/lib/components/copilot/lib.ts
+++ b/frontend/src/lib/components/copilot/lib.ts
@@ -132,7 +132,8 @@ async function getResourceTypes(scriptOptions: CopilotOptions) {
 
 	const resourceTypes = await ResourceService.queryResourceTypes({
 		workspace,
-		text: elems.join(';')
+		text: elems.join(';'),
+		limit: 3
 	})
 
 	return resourceTypes