diff --git a/packages/web/src/javascripts/Components/AttachedFilesPopover/PopoverFileItemAction.tsx b/packages/web/src/javascripts/Components/AttachedFilesPopover/PopoverFileItemAction.tsx
index 4a0a5ec7c..890197e59 100644
--- a/packages/web/src/javascripts/Components/AttachedFilesPopover/PopoverFileItemAction.tsx
+++ b/packages/web/src/javascripts/Components/AttachedFilesPopover/PopoverFileItemAction.tsx
@@ -40,6 +40,6 @@ export type PopoverFileItemAction =
       type: PopoverFileItemActionType.PreviewFile
       payload: {
         file: FileItem
-        otherFiles: FileItem[]
+        otherFiles?: FileItem[]
       }
     }
diff --git a/packages/web/src/javascripts/Controllers/FilePreviewModalController.ts b/packages/web/src/javascripts/Controllers/FilePreviewModalController.ts
index 20dc6a08e..d274c39b1 100644
--- a/packages/web/src/javascripts/Controllers/FilePreviewModalController.ts
+++ b/packages/web/src/javascripts/Controllers/FilePreviewModalController.ts
@@ -22,9 +22,11 @@ export class FilePreviewModalController {
     this.currentFile = currentFile
   }
 
-  activate = (currentFile: FileItem, otherFiles: FileItem[]) => {
+  activate = (currentFile: FileItem, otherFiles?: FileItem[]) => {
     this.currentFile = currentFile
-    this.otherFiles = otherFiles
+    if (otherFiles) {
+      this.otherFiles = otherFiles
+    }
     this.isOpen = true
   }
 
diff --git a/packages/web/src/javascripts/Controllers/FilesController.ts b/packages/web/src/javascripts/Controllers/FilesController.ts
index 7e83e74cb..985f92282 100644
--- a/packages/web/src/javascripts/Controllers/FilesController.ts
+++ b/packages/web/src/javascripts/Controllers/FilesController.ts
@@ -421,6 +421,19 @@ export class FilesController extends AbstractViewController<FilesControllerEvent
       addToast({
         type: ToastType.Success,
         message: `Uploaded file "${uploadedFile.name}"`,
+        actions: [
+          {
+            label: 'Open',
+            handler: (toastId) => {
+              void this.handleFileAction({
+                type: PopoverFileItemActionType.PreviewFile,
+                payload: { file: uploadedFile },
+              })
+              dismissToast(toastId)
+            },
+          },
+        ],
+        autoClose: true,
       })
 
       return uploadedFile