diff --git a/core/src/main/java/bisq/core/btc/wallet/BisqDefaultCoinSelector.java b/core/src/main/java/bisq/core/btc/wallet/BisqDefaultCoinSelector.java
index c540cc5112..f92e497086 100644
--- a/core/src/main/java/bisq/core/btc/wallet/BisqDefaultCoinSelector.java
+++ b/core/src/main/java/bisq/core/btc/wallet/BisqDefaultCoinSelector.java
@@ -56,7 +56,7 @@ public abstract class BisqDefaultCoinSelector implements CoinSelector {
     // We reset the value to null just after we have applied it inside the select method.
     @Nullable
     @Setter
-    protected Set<TransactionOutput> utxoCandidates;
+    private Set<TransactionOutput> utxoCandidates;
 
     public CoinSelection select(Coin target, Set<TransactionOutput> candidates) {
         return select(target, new ArrayList<>(candidates));
@@ -78,8 +78,6 @@ public abstract class BisqDefaultCoinSelector implements CoinSelector {
         ArrayList<TransactionOutput> sortedOutputs;
         if (utxoCandidates != null) {
             sortedOutputs = new ArrayList<>(utxoCandidates);
-            // We reuse the selectors. Reset the transactionOutputCandidates field
-            utxoCandidates = null;
         } else {
             sortedOutputs = new ArrayList<>(candidates);
         }
diff --git a/core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java b/core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java
index ad28df8be5..273def00b0 100644
--- a/core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java
+++ b/core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java
@@ -588,7 +588,7 @@ public class BsqWalletService extends WalletService implements DaoStateListener
             wallet.completeTx(sendRequest);
             checkWalletConsistency(wallet);
             verifyTransaction(tx);
-
+            coinSelector.setUtxoCandidates(null);   // We reuse the selectors. Reset the transactionOutputCandidates field
             return tx;
         } catch (InsufficientMoneyException e) {
             log.error("getPreparedSendTx: tx={}", tx.toString());
diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/TxInputSelectionWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/TxInputSelectionWindow.java
index abbd34c7dc..06a565d172 100644
--- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/TxInputSelectionWindow.java
+++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/TxInputSelectionWindow.java
@@ -124,7 +124,7 @@ public class TxInputSelectionWindow extends Overlay<TxInputSelectionWindow> {
                 .map(transactionOutput -> new TransactionOutputItem(transactionOutput, candidates.contains(transactionOutput)))
                 .collect(Collectors.toList()));
         tableView.setItems(new SortedList<>(items));
-        GUIUtil.setFitToRowsForTableView(tableView, 26, 28, 0, items.size());
+        GUIUtil.setFitToRowsForTableView(tableView, 26, 28, 3, 15);
 
         balanceTextField = FormBuilder.addBalanceTextField(gridPane, rowIndex++, Res.get("inputControlWindow.balanceLabel"), Layout.FIRST_ROW_DISTANCE);
         balanceTextField.setFormatter(formatter);