diff --git a/src/js/assets.js b/src/js/assets.js
index de96aa6b1..58e741473 100644
--- a/src/js/assets.js
+++ b/src/js/assets.js
@@ -1471,6 +1471,16 @@ exports.restart = function() {
 
 /******************************************************************************/
 
+// Call when disabling uBlock, to ensure it doesn't stick around as a detached
+// window object in Firefox.
+
+exports.shutdown = function() {
+    suspendUpdateDaemon();
+    reset();
+};
+
+/******************************************************************************/
+
 return exports;
 
 })();
diff --git a/src/js/start.js b/src/js/start.js
index 663ee1a3f..1e882ca0b 100644
--- a/src/js/start.js
+++ b/src/js/start.js
@@ -39,6 +39,7 @@ var µb = µBlock;
 
 vAPI.app.onShutdown = function() {
     µb.staticFilteringReverseLookup.shutdown();
+    µb.assetUpdater.shutdown();
     µb.staticNetFilteringEngine.reset();
     µb.sessionFirewall.reset();
     µb.permanentFirewall.reset();