--- a/mobile/android/chrome/geckoview/GeckoViewContent.js
+++ b/mobile/android/chrome/geckoview/GeckoViewContent.js
@@ -36,21 +36,16 @@ class GeckoViewContent extends GeckoView
     addEventListener("contextmenu", this, { capture: true });
 
     this.messageManager.addMessageListener("GeckoView:DOMFullscreenEntered",
                                            this);
     this.messageManager.addMessageListener("GeckoView:DOMFullscreenExited",
                                            this);
     this.messageManager.addMessageListener("GeckoView:ZoomToInput",
                                            this);
-
-    this.progressFilter =
-      Cc["@mozilla.org/appshell/component/browser-status-filter;1"]
-      .createInstance(Ci.nsIWebProgress);
-    this.flags = Ci.nsIWebProgress.NOTIFY_LOCATION;
   }
 
   onDisable() {
     debug `onDisable`;
 
     removeEventListener("DOMTitleChanged", this);
     removeEventListener("DOMWindowFocus", this);
     removeEventListener("DOMWindowClose", this);
@@ -201,16 +196,23 @@ class GeckoViewContent extends GeckoView
         this._savedState = JSON.parse(aMsg.data.state);
 
         if (this._savedState.history) {
           let restoredHistory = SessionHistory.restore(docShell, this._savedState.history);
 
           addEventListener("load", this, {capture: true, mozSystemGroup: true, once: true});
           addEventListener("pageshow", this, {capture: true, mozSystemGroup: true, once: true});
 
+          if (!this.progressFilter) {
+            this.progressFilter =
+              Cc["@mozilla.org/appshell/component/browser-status-filter;1"]
+              .createInstance(Ci.nsIWebProgress);
+            this.flags = Ci.nsIWebProgress.NOTIFY_LOCATION;
+          }
+
           this.progressFilter.addProgressListener(this, this.flags);
           let webProgress = docShell.QueryInterface(Ci.nsIInterfaceRequestor)
                                     .getInterface(Ci.nsIWebProgress);
           webProgress.addProgressListener(this.progressFilter, this.flags);
 
           restoredHistory.QueryInterface(Ci.nsISHistory).reloadCurrentEntry();
         }
         break;

--- a/mobile/android/modules/geckoview/GeckoViewContent.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewContent.jsm
@@ -11,16 +11,18 @@ ChromeUtils.import("resource://gre/modul
 
 class GeckoViewContent extends GeckoViewModule {
   onInit() {
     this.eventDispatcher.registerListener(this, [
       "GeckoView:SetActive",
       "GeckoView:SaveState",
       "GeckoView:RestoreState"
     ]);
+
+    this.messageManager.addMessageListener("GeckoView:SaveStateFinish", this);
   }
 
   onEnable() {
     this.registerContent("chrome://geckoview/content/GeckoViewContent.js");
 
     this.window.addEventListener("MozDOMFullScreen:Entered", this,
                                  /* capture */ true, /* untrusted */ false);
     this.window.addEventListener("MozDOMFullScreen:Exited", this,
@@ -28,17 +30,16 @@ class GeckoViewContent extends GeckoView
 
     this.registerListener([
         "GeckoViewContent:ExitFullScreen",
         "GeckoView:ZoomToInput",
     ]);
 
     this.messageManager.addMessageListener("GeckoView:DOMFullscreenExit", this);
     this.messageManager.addMessageListener("GeckoView:DOMFullscreenRequest", this);
-    this.messageManager.addMessageListener("GeckoView:SaveStateFinish", this);
   }
 
   onDisable() {
     this.window.removeEventListener("MozDOMFullScreen:Entered", this,
                                     /* capture */ true);
     this.window.removeEventListener("MozDOMFullScreen:Exited", this,
                                     /* capture */ true);