From a737732521e3ae5730bf1b3450da112f34f38773 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Wed, 2 Nov 2016 15:19:16 -0700
Subject: [PATCH] Only remove guest from embedder when view id changes

---
 lib/browser/guest-view-manager.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/browser/guest-view-manager.js b/lib/browser/guest-view-manager.js
index 556441f6332..9ca8326daec 100644
--- a/lib/browser/guest-view-manager.js
+++ b/lib/browser/guest-view-manager.js
@@ -162,8 +162,12 @@ const attachGuest = function (embedder, elementInstanceId, guestInstanceId, para
   if (guestInstance.elementInstanceId) {
     const oldKey = `${guestInstance.embedder.getId()}-${guestInstance.elementInstanceId}`
     delete embedderElementsMap[oldKey]
-    webViewManager.removeGuest(guestInstance.embedder, guestInstanceId)
-    guestInstance.embedder.send(`ELECTRON_GUEST_VIEW_INTERNAL_DESTROY_GUEST-${guest.viewInstanceId}`)
+
+    // Remove guest from embedder if moving across web views
+    if (guest.viewInstanceId !== params.instanceId) {
+      webViewManager.removeGuest(guestInstance.embedder, guestInstanceId)
+      guestInstance.embedder.send(`ELECTRON_GUEST_VIEW_INTERNAL_DESTROY_GUEST-${guest.viewInstanceId}`)
+    }
   }
 
   const webPreferences = {