diff --git a/src/js/messaging.js b/src/js/messaging.js
index 2ea75fa94..b337b9160 100644
--- a/src/js/messaging.js
+++ b/src/js/messaging.js
@@ -211,8 +211,8 @@ var getHostnameDict = function(hostnameToCountMap) {
                 domain: domain,
                 blockCount: blockCount,
                 allowCount: allowCount,
-                totalBlockCount: 0,
-                totalAllowCount: 0
+                totalBlockCount: blockCount,
+                totalAllowCount: allowCount
             };
         } else {
             de = r[domain];
diff --git a/src/js/tab.js b/src/js/tab.js
index 1eb331d25..a245e315f 100644
--- a/src/js/tab.js
+++ b/src/js/tab.js
@@ -286,7 +286,7 @@ housekeep itself.
         this.rawURL = stackEntry.url;
         this.normalURL = µb.normalizePageURL(this.tabId, this.rawURL);
         this.rootHostname = µb.URI.hostnameFromURI(this.normalURL);
-        this.rootDomain = µb.URI.domainFromHostname(this.rootHostname);
+        this.rootDomain = µb.URI.domainFromHostname(this.rootHostname) || this.rootHostname;
     };
 
     // Called whenever a candidate root URL is spotted for the tab.