diff --git a/BTCPayServer/Controllers/WalletsController.cs b/BTCPayServer/Controllers/WalletsController.cs
index 51e1e3c29..8f52f839c 100644
--- a/BTCPayServer/Controllers/WalletsController.cs
+++ b/BTCPayServer/Controllers/WalletsController.cs
@@ -247,7 +247,7 @@ namespace BTCPayServer.Controllers
             }
 
             var subtractFeesOutputsCount = new List<int>();
-
+            var substractFees = vm.Outputs.Any(o => o.SubtractFeesFromOutput);
             for (var i = 0; i < vm.Outputs.Count; i++)
             {
                 var transactionOutput = vm.Outputs[i];
@@ -278,7 +278,7 @@ namespace BTCPayServer.Controllers
                     vm.AddModelError(model => model.Outputs[subtractFeesOutput].SubtractFeesFromOutput,
                         "You can only subtract fees from one output", ModelState);
                 }
-            }else if (vm.CurrentBalance == transactionAmountSum && vm.Outputs.Count > 1)
+            }else if (vm.CurrentBalance == transactionAmountSum && !substractFees)
             {
                 ModelState.AddModelError(string.Empty,
                     "You are sending your entire balance, you should subtract the fees from an output");
diff --git a/BTCPayServer/Views/Wallets/WalletSend.cshtml b/BTCPayServer/Views/Wallets/WalletSend.cshtml
index 4542f136a..f5e1280d3 100644
--- a/BTCPayServer/Views/Wallets/WalletSend.cshtml
+++ b/BTCPayServer/Views/Wallets/WalletSend.cshtml
@@ -60,6 +60,11 @@
                         <div class="list-group-item transaction-output-form p-0 pl-lg-2">
                             <div class="row">
                                 <div class="col-sm-12 col-md-12 col-lg-10  py-2 ">
+                                    <div class="form-group">
+                                        <label asp-for="Outputs[index].DestinationAddress" class="control-label"></label>
+                                        <input asp-for="Outputs[index].DestinationAddress" class="form-control" />
+                                        <span asp-validation-for="Outputs[index].DestinationAddress" class="text-danger"></span>
+                                    </div>
                                     <div class="form-group">
                                         <label asp-for="Outputs[index].Amount" class="control-label"></label>
                                         <div class="input-group">
@@ -74,11 +79,6 @@
                                         </p>
                                         <span asp-validation-for="Outputs[index].Amount" class="text-danger"></span>
                                     </div>
-                                    <div class="form-group">
-                                        <label asp-for="Outputs[index].DestinationAddress" class="control-label"></label>
-                                        <input asp-for="Outputs[index].DestinationAddress" class="form-control" />
-                                        <span asp-validation-for="Outputs[index].DestinationAddress" class="text-danger"></span>
-                                    </div>
                                     <div class="form-group">
                                         <label asp-for="Outputs[index].SubtractFeesFromOutput" class="control-label"></label>
                                         <input type="checkbox" asp-for="Outputs[index].SubtractFeesFromOutput" class="form-check subtract-fees" />