diff --git a/src/main/resources/static/js/multitool/PdfContainer.js b/src/main/resources/static/js/multitool/PdfContainer.js
index f8eb36e6..f51bfade 100644
--- a/src/main/resources/static/js/multitool/PdfContainer.js
+++ b/src/main/resources/static/js/multitool/PdfContainer.js
@@ -6,7 +6,6 @@ class PdfContainer {
     downloadLink;
 
     constructor(id, wrapperId, pdfAdapters) {
-        this.fileName = null;
         this.pagesContainer = document.getElementById(id)
         this.pagesContainerWrapper = document.getElementById(wrapperId);
         this.downloadLink = null;
@@ -34,13 +33,11 @@ class PdfContainer {
         window.rotateAll = this.rotateAll;
 
         const filenameInput = document.getElementById('filename-input');
-        const filenameParagraph = document.getElementById('filename');
         const downloadBtn = document.getElementById('export-button');
 
         filenameInput.onkeyup = this.updateFilename;
         filenameInput.disabled = true;
         filenameInput.innerText = "";
-        filenameParagraph.innerText = "";
         downloadBtn.disabled = true;
     }
 
@@ -83,8 +80,18 @@ class PdfContainer {
 
                 if (pagesContainer.childElementCount === 0) {
                     filenameInput.value = "";
+                    this.filename = null;
                     downloadBtn.disabled = true;
+                } else {
+                    this.filename = filenameInput.value;
                 }
+
+                if (this.filename === null || this.filename === undefined) {
+                    filenameInput.value = files[0].name;
+                } else {
+                    filenameInput.value = this.filename;
+                }
+
             }
 
             this.addPdfsFromFiles(files, nextSiblingElement);
@@ -219,6 +226,12 @@ class PdfContainer {
         const url = URL.createObjectURL(pdfBlob);
         const downloadOption = localStorage.getItem('downloadOption');
 
+        const filenameInput = document.getElementById('filename-input');
+
+        if (!filenameInput.value.includes('.pdf')) {
+            filenameInput.value = filenameInput.value + '.pdf';
+        }
+
         if (downloadOption === 'sameWindow') {
             // Open the file in the same window
             window.location.href = url;
@@ -245,11 +258,9 @@ class PdfContainer {
 
     updateFilename() {
        const filenameInput = document.getElementById('filename-input');
-        const filenameParagraph = document.getElementById('filename');
         const downloadBtn = document.getElementById('export-button');
 
         if (filenameInput.value === "") {
-            filenameParagraph.innerText = "";
             downloadBtn.disabled = true;
             return;
         }
diff --git a/src/main/resources/templates/multi-tool.html b/src/main/resources/templates/multi-tool.html
index 4e1276de..4994c078 100644
--- a/src/main/resources/templates/multi-tool.html
+++ b/src/main/resources/templates/multi-tool.html
@@ -23,10 +23,7 @@
                         <div id="global-buttons-container" class="d-flex align-content-center justify-content-center">
                             <div class="form-group">
                                 <label for="filename-input">Filename</label>
-                                <input type="text" class="form-control" id="filename-input" placeholder="filename" onkeyup="updateFilename()">
-                            </div>
-                            <div class="form-group">
-                                <p>Final name of file: </p><p id="filename"></p>
+                                <input type="text" class="form-control" id="filename-input" placeholder="filename" >
                             </div>
                         </div>
                         <div id="global-buttons-container">