diff --git a/changelog/74_UNRELEASED_xxxx-xx-xx.md b/changelog/74_UNRELEASED_xxxx-xx-xx.md
index d10f65e8..ad061a60 100644
--- a/changelog/74_UNRELEASED_xxxx-xx-xx.md
+++ b/changelog/74_UNRELEASED_xxxx-xx-xx.md
@@ -57,6 +57,7 @@
 ### General
 
 - Optimized sidebar icon spacing (thanks @chris-thorn)
+- Fixed that file uploads (product pictures and so on) didn't work for files where the file name contains multiple spaces
 
 ### API
 
diff --git a/public/js/extensions.js b/public/js/extensions.js
index d9587dce..2c694917 100644
--- a/public/js/extensions.js
+++ b/public/js/extensions.js
@@ -200,7 +200,12 @@ function QrCodeImgHtml(text)
 function CleanFileName(fileName)
 {
 	// Umlaute seem to cause problems on Linux...
-	return fileName.toLowerCase().replaceAll(/ä/g, 'ae').replaceAll(/ö/g, 'oe').replaceAll(/ü/g, 'ue').replaceAll(/ß/g, 'ss');
+	fileName = fileName.toLowerCase().replaceAll(/ä/g, 'ae').replaceAll(/ö/g, 'oe').replaceAll(/ü/g, 'ue').replaceAll(/ß/g, 'ss');
+
+	// Multiple spaces seem to be a problem, so simply strip them all
+	fileName = fileName.replace(/\s+/g, "");
+
+	return fileName;
 }
 
 function nl2br(s)