diff --git a/src/main/resources/static/js/fileView.js b/src/main/resources/static/js/fileView.js
index e2b6b4c..17021f3 100644
--- a/src/main/resources/static/js/fileView.js
+++ b/src/main/resources/static/js/fileView.js
@@ -7,4 +7,8 @@ function copyToClipboard() {
     }).catch(function (err) {
         console.error("Could not copy text: ", err);
     });
+}
+
+function showPreparingMessage() {
+    document.getElementById('preparingMessage').style.display = 'block';
 }
\ No newline at end of file
diff --git a/src/main/resources/templates/fileView.html b/src/main/resources/templates/fileView.html
index b609eda..14b6270 100644
--- a/src/main/resources/templates/fileView.html
+++ b/src/main/resources/templates/fileView.html
@@ -86,10 +86,16 @@
                         </button>
                     </div>
 
+                    <div class="alert alert-info" id="preparingMessage" style="display: none;">
+                        Your file is being prepared for download. Please wait...
+                    </div>
+
                     <div class="d-flex justify-content-between mt-3 border-top pt-3">
                         <a
                                 class="btn btn-success"
+                                id="downloadButton"
                                 th:href="@{/file/download/{id}(id=${file.id})}"
+                                th:onclick="${file.passwordHash != null} ? 'showPreparingMessage()' : ''"
                         >
                             Download
                         </a>