diff --git a/src/lib/components/layout/Sidebar/Folders/FolderModal.svelte b/src/lib/components/layout/Sidebar/Folders/FolderModal.svelte
index ae36e839dc..d5b76e9c45 100644
--- a/src/lib/components/layout/Sidebar/Folders/FolderModal.svelte
+++ b/src/lib/components/layout/Sidebar/Folders/FolderModal.svelte
@@ -30,6 +30,13 @@
 
 	const submitHandler = async () => {
 		loading = true;
+
+		if ((data?.files ?? []).some((file) => file.status === 'uploading')) {
+			toast.error($i18n.t('Please wait until all files are uploaded.'));
+			loading = false;
+			return;
+		}
+
 		await onSubmit({
 			name,
 			data