diff --git a/browser/modules/ContentSearch.jsm b/browser/modules/ContentSearch.jsm
index c51af281d372..3dc9ced5cb93 100644
--- a/browser/modules/ContentSearch.jsm
+++ b/browser/modules/ContentSearch.jsm
@@ -73,10 +73,11 @@ this.ContentSearch = {
     // the meantime, then we need to update msg.target.  event.detail will be
     // the docshell's new parent <xul:browser> element.
     msg.handleEvent = function (event) {
+      this.target.removeEventListener("SwapDocShells", this, true);
       this.target = event.detail;
+      this.target.addEventListener("SwapDocShells", this, true);
     };
     msg.target.addEventListener("SwapDocShells", msg, true);
-    msg.originalTarget = msg.target;
 
     this._eventQueue.push({
       type: "Message",
@@ -116,7 +117,7 @@ this.ContentSearch = {
     if (methodName in this) {
       yield this._initService();
       yield this[methodName](msg, msg.data.data);
-      msg.originalTarget.removeEventListener("SwapDocShells", msg, true);
+      msg.target.removeEventListener("SwapDocShells", msg, true);
     }
   }),