Prevent unnecessary electron popup windows for links (#685)

2 files changed, 10 insertions, 1 deletions

diff --git a/src/index.js b/src/index.js
index 027884826..85aa9d1b9 100644
--- a/src/index.js
+++ b/src/index.js
@@ -192,6 +192,14 @@ const createWindow = () => {
     },
   });
 
+  app.on('web-contents-created', (e, contents) => {
+    if (contents.getType() === 'webview') {
+      contents.on('new-window', (event) => {
+        event.preventDefault();
+      });
+    }
+  });
+
   mainWindow.webContents.on('did-finish-load', () => {
     const fns = onDidLoadFns;
     onDidLoadFns = null;
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 0ad523374..a8d9cc1fb 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -631,7 +631,8 @@ export default class ServicesStore extends Store {
   }
 
   @action _openWindow({ event }) {
-    if (event.disposition !== 'new-window' && event.url !== 'about:blank') {
+    if (event.url !== 'about:blank') {
+      event.preventDefault();
       this.actions.app.openExternalUrl({ url: event.url });
     }
   }