diff --git a/app/src/main/java/com/beemdevelopment/aegis/SortCategory.java b/app/src/main/java/com/beemdevelopment/aegis/SortCategory.java
index 5b3a9a906c..31dbb40079 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/SortCategory.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/SortCategory.java
@@ -31,16 +31,16 @@ public Comparator<VaultEntry> getComparator() {
 
         switch (this) {
             case ACCOUNT:
-                comparator = new AccountNameComparator();
+                comparator = new AccountNameComparator().thenComparing(new IssuerNameComparator());
                 break;
             case ACCOUNT_REVERSED:
-                comparator = Collections.reverseOrder(new AccountNameComparator());
+                comparator = Collections.reverseOrder(new AccountNameComparator().thenComparing(new IssuerNameComparator()));
                 break;
             case ISSUER:
-                comparator = new IssuerNameComparator();
+                comparator = new IssuerNameComparator().thenComparing(new AccountNameComparator());
                 break;
             case ISSUER_REVERSED:
-                comparator = Collections.reverseOrder(new IssuerNameComparator());
+                comparator = Collections.reverseOrder(new IssuerNameComparator().thenComparing(new AccountNameComparator()));
                 break;
             case USAGE_COUNT:
                 comparator = Collections.reverseOrder(new UsageCountComparator());