2 files changed, 21 insertions, 7 deletions

diff --git a/src/index.js b/src/index.js
index 9dfbb4d8f..dac8ec770 100644
--- a/src/index.js
+++ b/src/index.js
@@ -332,7 +332,7 @@ const createWindow = () => {
     e.preventDefault();
 
     if (isValidExternalURL(url)) {
-      shell.openExternal(url);
+        shell.openExternal(url);
     }
   });
 
@@ -411,6 +411,15 @@ ipcMain.on('feature-basic-auth-credentials', (e, { user, password }) => {
   authCallback = noop;
 });
 
+ipcMain.on('open-browser-window', (e, {disposition, url}, serviceId) => {
+  if (disposition === 'foreground-tab') {
+    let serviceSession = session.fromPartition(`persist:service-${serviceId}`)
+    let child = new BrowserWindow({ parent: mainWindow, webPreferences: {session: serviceSession}});
+    child.show();
+    child.loadURL(url);
+  }
+  debug('Received open-browser-window', disposition, url);
+});
 
 ipcMain.on('modifyRequestHeaders', (e, { modifiedRequestHeaders, serviceId }) => {
   debug('Received modifyRequestHeaders', modifiedRequestHeaders, serviceId);
diff --git a/src/models/Service.js b/src/models/Service.js
index fb8a4298b..45dc55fce 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -266,12 +266,17 @@ export default class Service {
     }));
 
     this.webview.addEventListener('new-window', (event, url, frameName, options) => {
-      openWindow({
-        event,
-        url,
-        frameName,
-        options,
-      });
+      debug('new-window', event, url, frameName, options);
+      if (event.disposition === 'foreground-tab') {
+        ipcRenderer.send('open-browser-window', event, this.id);
+      } else {
+        openWindow({
+          event,
+          url,
+          frameName,
+          options,
+        });
+      }
     });