diff --git a/src/popup/app/current/currentController.js b/src/popup/app/current/currentController.js
index 44809b2c2d..cb1ece865f 100644
--- a/src/popup/app/current/currentController.js
+++ b/src/popup/app/current/currentController.js
@@ -33,12 +33,6 @@ angular
                 }
 
                 domain = utilsService.getDomain(url);
-                if (!domain) {
-                    $timeout(function () {
-                        $scope.loaded = true;
-                    });
-                    return;
-                }
 
                 chrome.tabs.sendMessage(tabs[0].id, {
                     command: 'collectPageDetails',
diff --git a/src/services/cipherService.js b/src/services/cipherService.js
index b2c522d69e..b0651d5278 100644
--- a/src/services/cipherService.js
+++ b/src/services/cipherService.js
@@ -263,7 +263,11 @@ function initCipherService() {
     CipherService.prototype.getAllDecryptedForDomain = function (domain, includeOtherTypes) {
         var self = this;
 
-        var eqDomainsPromise = self.settingsService.getEquivalentDomains().then(function (eqDomains) {
+        if (!domain && !includeOtherTypes) {
+            return Q([]);
+        }
+
+        var eqDomainsPromise = !domain ? Q([]) : self.settingsService.getEquivalentDomains().then(function (eqDomains) {
             var matchingDomains = [];
             for (var i = 0; i < eqDomains.length; i++) {
                 if (eqDomains[i].length && eqDomains[i].indexOf(domain) >= 0) {
@@ -284,7 +288,7 @@ function initCipherService() {
                 ciphersToReturn = [];
 
             for (var i = 0; i < ciphers.length; i++) {
-                if (ciphers[i].type === self.constantsService.cipherType.login && ciphers[i].login.domain &&
+                if (domain && ciphers[i].type === self.constantsService.cipherType.login && ciphers[i].login.domain &&
                     matchingDomains.indexOf(ciphers[i].login.domain) > -1) {
                     ciphersToReturn.push(ciphers[i]);
                 }