diff --git a/src/lib/components/workspace/Prompts/PromptEditor.svelte b/src/lib/components/workspace/Prompts/PromptEditor.svelte
index 4ad3298c6a..6dfbdf103a 100644
--- a/src/lib/components/workspace/Prompts/PromptEditor.svelte
+++ b/src/lib/components/workspace/Prompts/PromptEditor.svelte
@@ -80,6 +80,7 @@
 	}
 
 	const submitHandler = async () => {
+		if (loading) return;
 		if (disabled) {
 			toast.error($i18n.t('You do not have permission to edit this prompt.'));
 			return;
@@ -658,7 +659,7 @@
 				<button
 					class="{modal
 						? 'px-3.5 py-1.5 text-xs rounded-full w-fit'
-						: 'text-xs w-full lg:w-fit px-4 py-2 rounded-xl'} transition bg-black hover:bg-gray-900 text-white dark:bg-white dark:hover:bg-gray-100 dark:text-black flex justify-center"
+						: 'text-xs w-full lg:w-fit px-4 py-2 rounded-xl'} transition bg-black hover:bg-gray-900 text-white dark:bg-white dark:hover:bg-gray-100 dark:text-black flex justify-center disabled:cursor-not-allowed disabled:opacity-50"
 					type="submit"
 					disabled={loading}
 				>