diff --git a/modules/document_repository/jsx/docIndex.js b/modules/document_repository/jsx/docIndex.js
index a8f62ed3b7c..7e1a7a23c88 100644
--- a/modules/document_repository/jsx/docIndex.js
+++ b/modules/document_repository/jsx/docIndex.js
@@ -183,7 +183,7 @@ class DocIndex extends React.Component {
         <a
           href={downloadURL}
           target="_blank"
-          download={row['File Name']}
+          download={encodeURIComponent(row['File Name'])}
         >
           {cell}
         </a>
diff --git a/php/libraries/FilesDownloadHandler.php b/php/libraries/FilesDownloadHandler.php
index e46d4038d5f..9782b5ba1a1 100644
--- a/php/libraries/FilesDownloadHandler.php
+++ b/php/libraries/FilesDownloadHandler.php
@@ -99,7 +99,7 @@ public function handle(ServerRequestInterface $request) : ResponseInterface
         return (new \LORIS\Http\Response\JSON\OK())
             ->withHeader(
                 'Content-Disposition',
-                'attachment; filename=' . $filename
+                'attachment; filename=' . urlencode($filename)
             )
             ->withHeader(
                 'Content-Type',