diff --git a/packages/web/src/javascripts/Components/FilePreview/FilePreviewError.tsx b/packages/web/src/javascripts/Components/FilePreview/FilePreviewError.tsx
index 67f9a9f36..79c0db645 100644
--- a/packages/web/src/javascripts/Components/FilePreview/FilePreviewError.tsx
+++ b/packages/web/src/javascripts/Components/FilePreview/FilePreviewError.tsx
@@ -1,6 +1,7 @@
 import { FilesController } from '@/Controllers/FilesController'
 import { NoPreviewIllustration } from '@standardnotes/icons'
 import { FileItem } from '@standardnotes/snjs'
+import { FileItemActionType } from '../AttachedFilesPopover/PopoverFileItemAction'
 import Button from '../Button/Button'
 
 type Props = {
@@ -32,7 +33,14 @@ const FilePreviewError = ({ file, filesController, isFilePreviewable, tryAgainCa
             </Button>
             <Button
               onClick={() => {
-                filesController.downloadFile(file).catch(console.error)
+                filesController
+                  .handleFileAction({
+                    type: FileItemActionType.DownloadFile,
+                    payload: {
+                      file,
+                    },
+                  })
+                  .catch(console.error)
               }}
             >
               Download
@@ -47,7 +55,12 @@ const FilePreviewError = ({ file, filesController, isFilePreviewable, tryAgainCa
           <Button
             primary
             onClick={() => {
-              filesController.downloadFile(file).catch(console.error)
+              filesController
+                .handleFileAction({
+                  type: FileItemActionType.DownloadFile,
+                  payload: { file },
+                })
+                .catch(console.error)
             }}
           >
             Download
diff --git a/packages/web/src/javascripts/Controllers/FilesController.ts b/packages/web/src/javascripts/Controllers/FilesController.ts
index 2496e07fa..a63367c39 100644
--- a/packages/web/src/javascripts/Controllers/FilesController.ts
+++ b/packages/web/src/javascripts/Controllers/FilesController.ts
@@ -498,6 +498,15 @@ export class FilesController extends AbstractViewController<FilesControllerEvent
   }
 
   downloadFiles = async (files: FileItem[]) => {
-    await Promise.all(files.map((file) => this.downloadFile(file)))
+    await Promise.all(
+      files.map((file) =>
+        this.handleFileAction({
+          type: FileItemActionType.DownloadFile,
+          payload: {
+            file,
+          },
+        }),
+      ),
+    )
   }
 }