diff --git a/src/lib/components/common/Textarea.svelte b/src/lib/components/common/Textarea.svelte
index f0c4691b2..f7c4865d7 100644
--- a/src/lib/components/common/Textarea.svelte
+++ b/src/lib/components/common/Textarea.svelte
@@ -15,6 +15,7 @@
 	onMount(async () => {
 		await tick();
 		if (textareaElement) {
+			await tick();
 			setTimeout(adjustHeight, 0);
 		}
 	});
@@ -32,6 +33,7 @@
 	bind:value
 	{placeholder}
 	on:input={adjustHeight}
+	on:focus={adjustHeight}
 	class={className}
 	{rows}
 	{required}