diff --git a/plugins/MergerSite/MergerSitePlugin.py b/plugins/MergerSite/MergerSitePlugin.py
index fb7456bd..c1c1bde8 100644
--- a/plugins/MergerSite/MergerSitePlugin.py
+++ b/plugins/MergerSite/MergerSitePlugin.py
@@ -258,6 +258,7 @@ class SiteStoragePlugin(object):
             for address, merged_type in merged_db.iteritems()
             if merged_type in merger_types
         ]
+        found = 0
         for merged_site in merged_sites:
             self.log.debug("Loading merged site: %s" % merged_site)
             merged_type = merged_db[merged_site.address]
@@ -280,6 +281,9 @@ class SiteStoragePlugin(object):
                         yield merged_inner_path, merged_site.storage.getPath(file_inner_path)
                     else:
                         merged_site.log.error("[MISSING] %s" % file_inner_path)
+                    found += 1
+                    if found % 100 == 0:
+                        time.sleep(0.000001)  # Context switch to avoid UI block
 
     # Also notice merger sites on a merged site file change
     def onUpdated(self, inner_path, file=None):
diff --git a/src/Config.py b/src/Config.py
index 69c2b451..46ebe15d 100644
--- a/src/Config.py
+++ b/src/Config.py
@@ -10,7 +10,7 @@ class Config(object):
 
     def __init__(self, argv):
         self.version = "0.6.0"
-        self.rev = 3164
+        self.rev = 3165
         self.argv = argv
         self.action = None
         self.config_file = "zeronet.conf"