diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09e0c1b3..4bdaea33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## 2.0.0 (not yet released)
 * CHANGED: Remove page template (#265)
+* FIXED: Name mismatches in attached files (#1584)
 
 ## 1.7.8 (2025-06-30)
 * FIXED: Duplicate attachment for every comment (#1577)
diff --git a/js/privatebin.js b/js/privatebin.js
index d0f5cb23..000dc232 100644
--- a/js/privatebin.js
+++ b/js/privatebin.js
@@ -3270,13 +3270,13 @@ jQuery.PrivateBin = (function($, RawDeflate) {
 
             if (typeof loadedFiles !== 'undefined') {
                 files = loadedFiles;
-                loadedFiles.forEach(loadedFile => {
+                loadedFiles.forEach((loadedFile, index) => {
                     const fileReader = new FileReader();
 
                     fileReader.onload = function (event) {
                         const dataURL = event.target.result;
                         if (dataURL) {
-                            attachmentsData.push(dataURL);
+                            attachmentsData[index] = dataURL;
                         }
 
                         if (Editor.isPreview()) {