diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/FilterWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/FilterWindow.java
index 448f0a75c8..8f4943734d 100644
--- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/FilterWindow.java
+++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/FilterWindow.java
@@ -183,21 +183,10 @@ public class FilterWindow extends Overlay<FilterWindow> {
         }
         Button sendButton = new AutoTooltipButton(Res.get("filterWindow.add"));
         sendButton.setOnAction(e -> {
-            List<PaymentAccountFilter> paymentAccountFilters = readAsList(paymentAccountFilterInputTextField)
-                    .stream().map(item -> {
-                        String[] list = item.split("\\|");
-                        if (list.length == 3)
-                            return new PaymentAccountFilter(list[0], list[1], list[2]);
-                        else
-                            return new PaymentAccountFilter("", "", "");
-                    })
-                    .collect(Collectors.toList());
-
-
             if (sendFilterMessageHandler.handle(new Filter(
                             readAsList(offerIdsInputTextField),
                             readAsList(nodesInputTextField),
-                            paymentAccountFilters,
+                            readAsPaymentAccountFiltersList(paymentAccountFilterInputTextField),
                             readAsList(bannedCurrenciesInputTextField),
                             readAsList(bannedPaymentMethodsInputTextField),
                             readAsList(arbitratorsInputTextField),
@@ -252,4 +241,16 @@ public class FilterWindow extends Overlay<FilterWindow> {
             return Arrays.asList(StringUtils.deleteWhitespace(field.getText()).split(","));
         }
     }
+
+    private List<PaymentAccountFilter> readAsPaymentAccountFiltersList(InputTextField field) {
+        return readAsList(field)
+                .stream().map(item -> {
+                    String[] list = item.split("\\|");
+                    if (list.length == 3)
+                        return new PaymentAccountFilter(list[0], list[1], list[2]);
+                    else
+                        return new PaymentAccountFilter("", "", "");
+                })
+                .collect(Collectors.toList());
+    }
 }