diff --git a/src/popup/interface.js b/src/popup/interface.js
index be1f225..92b16dc 100644
--- a/src/popup/interface.js
+++ b/src/popup/interface.js
@@ -165,19 +165,26 @@ function search(s) {
     var candidates = this.logins.map(result => Object.assign(result, { display: result.login }));
     if (this.currentDomainOnly) {
         var recent = candidates.filter(login => login.recent.count > 0);
-        recent.sort(function(a, b) {
-            if (a.store.when != b.store.when) {
-                return b.store.when - a.store.when;
-            }
-            if (a.recent.count != b.recent.count) {
-                return b.recent.count - a.recent.count;
-            }
-            return b.recent.when - a.recent.when;
-        });
-        candidates = recent.concat(
-            candidates.filter(login => login.inCurrentDomain && !login.recent.count)
+        var remainingInCurrentDomain = candidates.filter(
+            login => login.inCurrentDomain && !login.recent.count
         );
+        candidates = recent.concat(remainingInCurrentDomain);
     }
+    candidates.sort(function(a, b) {
+        if (a.store.when != b.store.when) {
+            return b.store.when - a.store.when;
+        }
+        if (a.recent.count != b.recent.count) {
+            return b.recent.count - a.recent.count;
+        }
+        if (a.recent.when != b.recent.when) {
+            return b.recent.when - a.recent.when;
+        }
+        if (a.store.name != b.store.name) {
+            return a.store.name.localeCompare(b.store.name);
+        }
+        return a.login.localeCompare(b.login);
+    });
 
     if (s.length) {
         var filter = s.split(/\s+/);