diff --git a/js/net-filtering.js b/js/net-filtering.js
index 3d9666844..9c3ce52ec 100644
--- a/js/net-filtering.js
+++ b/js/net-filtering.js
@@ -1272,6 +1272,7 @@ var FilterContainer = function() {
     this.buckets = new Array(4);
     this.blockedAnyPartyHostnames = new µb.LiquidDict();
     this.blocked3rdPartyHostnames = new µb.LiquidDict();
+    this.dynamicFilters = {};
     this.filterParser = new FilterParser();
     this.reset();
 };
@@ -1292,7 +1293,6 @@ FilterContainer.prototype.reset = function() {
     this.duplicates = Object.create(null);
     this.blockedAnyPartyHostnames.reset();
     this.blocked3rdPartyHostnames.reset();
-    this.dynamicFilters = {};
     this.filterParser.reset();
 };
 
diff --git a/js/storage.js b/js/storage.js
index c6b69de4e..1d27e3c39 100644
--- a/js/storage.js
+++ b/js/storage.js
@@ -667,10 +667,10 @@
     // User settings are in memory
     var onUserSettingsReady = function(settings) {
         µb.assets.autoUpdate = settings.autoUpdate;
-        µb.contextMenu.toggle(settings.contextMenuEnabled);
         µb.netFilteringEngine.dynamicFiltersFromSelfie(settings.dynamicFilteringSelfie);
         µb.fromSelfie(onSelfieReady);
         µb.mirrors.toggle(settings.experimentalEnabled);
+        µb.contextMenu.toggle(settings.contextMenuEnabled);
     };
 
     this.loadUserSettings(onUserSettingsReady);