1 files changed, 12 insertions, 12 deletions

diff --git a/src/index.js b/src/index.js
index 9146a23da..d2b0f56f4 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,6 +1,6 @@
 /* eslint-disable import/first */
 
-import { app, BrowserWindow, shell, ipcMain, session } from 'electron';
+import { app, BrowserWindow, ipcMain, session } from 'electron';
 
 import { emptyDirSync, ensureFileSync } from 'fs-extra';
 import { join } from 'path';
@@ -34,7 +34,7 @@ import { appId } from './package.json'; // eslint-disable-line import/no-unresol
 import './electron/exception';
 
 import { asarPath } from './helpers/asar-helpers';
-import { isValidExternalURL } from './helpers/url-helpers';
+import { openExternalUrl } from './helpers/url-helpers';
 import userAgent from './helpers/userAgent-helpers';
 
 const debug = require('debug')('Ferdi:App');
@@ -342,12 +342,8 @@ const createWindow = () => {
   app.isMaximized = mainWindow.isMaximized();
 
   mainWindow.webContents.on('new-window', (e, url) => {
-    debug('Open url', url);
     e.preventDefault();
-
-    if (isValidExternalURL(url)) {
-      shell.openExternal(url);
-    }
+    openExternalUrl(url);
   });
 
   if (settings.get('startMinimized')) {
@@ -392,10 +388,9 @@ app.on('ready', () => {
   enforceMacOSAppLocation();
 
   // Register App URL
-  if (isDevMode) {
-    app.setAsDefaultProtocolClient('ferdi-dev');
-  } else {
-    app.setAsDefaultProtocolClient('ferdi');
+  const protocolClient = isDevMode ? 'ferdi-dev' : 'ferdi';
+  if (!app.isDefaultProtocolClient(protocolClient)) {
+    app.setAsDefaultProtocolClient(protocolClient);
   }
 
   if (isWindows) {
@@ -455,7 +450,12 @@ ipcMain.on('open-browser-window', (e, { url, serviceId }) => {
   const serviceSession = session.fromPartition(`persist:service-${serviceId}`);
   const child = new BrowserWindow({
     parent: mainWindow,
-    webPreferences: { session: serviceSession },
+    webPreferences: {
+      session: serviceSession,
+      // TODO: Aren't these needed here?
+      // contextIsolation: false,
+      // enableRemoteModule: true,
+    },
   });
   child.show();
   child.loadURL(url);