diff --git a/src/main/java/bisq/desktop/util/CurrencyList.java b/src/main/java/bisq/desktop/util/CurrencyList.java
index 8570c7b7f69..7e8833062d3 100644
--- a/src/main/java/bisq/desktop/util/CurrencyList.java
+++ b/src/main/java/bisq/desktop/util/CurrencyList.java
@@ -31,8 +31,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.PriorityQueue;
-import java.util.Queue;
 import java.util.Set;
 import java.util.function.BiFunction;
 
@@ -61,10 +59,8 @@ public void updateWithCurrencies(List<TradeCurrency> currencies, @Nullable Curre
 
     private List<CurrencyListItem> getPartitionedSortedItems(List<TradeCurrency> currencies) {
         Map<TradeCurrency, Integer> tradesPerCurrency = countTrades(currencies);
-
-        Comparator<CurrencyListItem> comparator = getComparator();
-        Queue<CurrencyListItem> fiatCurrencies = new PriorityQueue<>(comparator);
-        Queue<CurrencyListItem> cryptoCurrencies = new PriorityQueue<>(comparator);
+        List<CurrencyListItem> fiatCurrencies = new ArrayList<>();
+        List<CurrencyListItem> cryptoCurrencies = new ArrayList<>();
 
         for (Map.Entry<TradeCurrency, Integer> entry : tradesPerCurrency.entrySet()) {
             TradeCurrency currency = entry.getKey();
@@ -80,7 +76,11 @@ private List<CurrencyListItem> getPartitionedSortedItems(List<TradeCurrency> cur
             }
         }
 
-        List<CurrencyListItem> result = Lists.newLinkedList();
+        Comparator<CurrencyListItem> comparator = getComparator();
+        fiatCurrencies.sort(comparator);
+        cryptoCurrencies.sort(comparator);
+
+        List<CurrencyListItem> result = new ArrayList<>();
         result.addAll(fiatCurrencies);
         result.addAll(cryptoCurrencies);