1 files changed, 19 insertions, 7 deletions

diff --git a/src/electron/ipc-api/download.js b/src/electron/ipc-api/download.js
index 36eca3c9f..16de66229 100644
--- a/src/electron/ipc-api/download.js
+++ b/src/electron/ipc-api/download.js
@@ -17,9 +17,15 @@ function decodeBase64Image(dataString) {
 
 export default (params) => {
   ipcMain.on('download-file', async (event, { url, content, fileOptions = {} }) => {
+    // We're passing a fake browserWindow to `electron-dl` in order to access the
+    // webContents of the webview that has initiated the download
+    const fakeWindow = {
+      webContents: event.sender.webContents,
+    };
+
     try {
       if (!content) {
-        const dl = await download(params.mainWindow, url, {
+        const dl = await download(fakeWindow, url, {
           saveAs: true,
         });
         debug('File saved to', dl.savePath);
@@ -27,14 +33,20 @@ export default (params) => {
         const extension = mime.extension(fileOptions.mime);
         const filename = `${fileOptions.name}.${extension}`;
 
-        dialog.showSaveDialog(params.mainWindow, {
-          defaultPath: filename,
-        }, (name) => {
+        try {
+          const saveDialog = await dialog.showSaveDialog(params.mainWindow, {
+            defaultPath: filename,
+          });
+
+          if (saveDialog.canceled) return;
+
           const binaryImage = decodeBase64Image(content);
-          fs.writeFileSync(name, binaryImage, 'binary');
+          fs.writeFileSync(saveDialog.filePath, binaryImage, 'binary');
 
-          debug('File blob saved to', name);
-        });
+          debug('File blob saved to', saveDialog.filePath);
+        } catch (err) {
+          console.log(err);
+        }
       }
     } catch (e) {
       console.error(e);