diff --git a/js/3p-filters.js b/js/3p-filters.js
index cfff9e18f..72630f963 100644
--- a/js/3p-filters.js
+++ b/js/3p-filters.js
@@ -376,7 +376,9 @@ var buttonApplyHandler = function() {
 /******************************************************************************/
 
 var buttonUpdateHandler = function() {
-    reloadAll(true);
+    if ( needUpdate ) {
+        reloadAll(true);
+    }
 };
 
 /******************************************************************************/
diff --git a/js/storage.js b/js/storage.js
index a8f1840d2..083c6dcf0 100644
--- a/js/storage.js
+++ b/js/storage.js
@@ -453,6 +453,7 @@
 // Load all
 
 µBlock.load = function() {
+    this.loadLocalSettings();
     // User settings need to be available for this because we need
     // µBlock.userSettings.externalLists
     this.loadUserSettings(this.loadUpdatableAssets.bind(this, this.userSettings.autoUpdate));