diff --git a/src/Pages/ChannelRequests.razor b/src/Pages/ChannelRequests.razor
index 7177f987..7ba98146 100644
--- a/src/Pages/ChannelRequests.razor
+++ b/src/Pages/ChannelRequests.razor
@@ -186,23 +186,8 @@
                     @(context.MempoolRecommendedFeesType == MempoolRecommendedFeesType.CustomFee ? $"{context.FeeRate} sat/vb" : _selectedMempoolRecommendedFeesType.ToString().Humanize())
                 </DisplayTemplate>
                 <EditTemplate>
-                    <div class="d-flex">
-                        <Select TValue="MempoolRecommendedFeesType" SelectedValue="@_selectedMempoolRecommendedFeesType" SelectedValueChanged="async (value) => await OnChangeFeeSelection(value)">
-                            <SelectGroup Label="Mempool.space fee">
-                                <SelectItem Value="MempoolRecommendedFeesType.EconomyFee">Economy Fee</SelectItem>
-                                <SelectItem Value="MempoolRecommendedFeesType.FastestFee">Fastest Fee</SelectItem>
-                                <SelectItem Value="MempoolRecommendedFeesType.HourFee">Hour Fee</SelectItem>
-                                <SelectItem Value="MempoolRecommendedFeesType.HalfHourFee">Half Hour Fee</SelectItem>
-                            </SelectGroup>
-                            <SelectItem Value="MempoolRecommendedFeesType.CustomFee">Custom</SelectItem>
-                        </Select>
-                        <NumericPicker TValue="long" @bind-Value="@_customSatPerVbAmount" CurrencySymbolPlacement="CurrencySymbolPlacement.Suffix" CurrencySymbol=" sat/vb" Min="1" Disabled="@(_selectedMempoolRecommendedFeesType != MempoolRecommendedFeesType.CustomFee)">
-                            <Feedback>
-                                <ValidationError/>
-                            </Feedback>
-                        </NumericPicker>
-                    </div>
-                    <FieldHelp>@(_selectedMempoolRecommendedFeesType != MempoolRecommendedFeesType.CustomFee ? "Fees may change by the time the request is processed" : "")</FieldHelp>
+                    <FeeRateSelector @bind-SelectedFeeType="@_selectedMempoolRecommendedFeesType"
+                                     @bind-CustomSatPerVb="@_customSatPerVbAmount" />
                 </EditTemplate>
             </DataGridColumn>
             <DataGridColumn TItem="ChannelOperationRequest" Displayable="@IsPendingRequestsColumnVisible(PendingChannelsColumnName.ChannelFeePolicy)" Editable="true" Caption="Channel Fee Policy" PopupFieldColumnSize="ColumnSize.Is12">
@@ -768,7 +753,7 @@
     {
         _utxoSelectorModalRef.ClearModal();
         _selectedMempoolRecommendedFeesType = MempoolRecommendedFeesType.FastestFee;
-        await OnChangeFeeSelection(_selectedMempoolRecommendedFeesType);
+        _customSatPerVbAmount = 1;
         await datagridRef.New();
     }
 
@@ -1302,12 +1287,6 @@
         StateHasChanged();
     }
 
-    private async Task OnChangeFeeSelection(MempoolRecommendedFeesType value)
-    {
-        _selectedMempoolRecommendedFeesType = value;
-        _customSatPerVbAmount = (long?)await NBXplorerService.GetFeesByType(_selectedMempoolRecommendedFeesType) ?? 1;
-    }
-
     private static string GetInitialChannelFeePolicyDisplayText(ChannelOperationRequest request)
     {
         var values = new List<string>();
diff --git a/src/Pages/Withdrawals.razor b/src/Pages/Withdrawals.razor
index bc1b803a..8ac8c92f 100644
--- a/src/Pages/Withdrawals.razor
+++ b/src/Pages/Withdrawals.razor
@@ -210,23 +210,8 @@
                     @(context.MempoolRecommendedFeesType == MempoolRecommendedFeesType.CustomFee ? $"Custom fee ({context.CustomFeeRate} sat/vb)" : $"{context.MempoolRecommendedFeesType.Humanize()} ({context.CustomFeeRate} sat/vb)")
                 </DisplayTemplate>
                 <EditTemplate>
-                    <div class="d-flex">
-                        <Select TValue="MempoolRecommendedFeesType" SelectedValue="_selectedMempoolRecommendedFeesType" SelectedValueChanged="async (value) => await OnMempoolFeeRateChange(value)">
-                            <SelectGroup Label="Mempool.space fee">
-                                <SelectItem Value="MempoolRecommendedFeesType.FastestFee">Fastest Fee</SelectItem>
-                                <SelectItem Value="MempoolRecommendedFeesType.EconomyFee">Economy Fee</SelectItem>
-                                <SelectItem Value="MempoolRecommendedFeesType.HourFee">Hour Fee</SelectItem>
-                                <SelectItem Value="MempoolRecommendedFeesType.HalfHourFee">Half Hour Fee</SelectItem>
-                            </SelectGroup>
-                            <SelectItem Value="MempoolRecommendedFeesType.CustomFee">Custom</SelectItem>
-                        </Select>
-                        <NumericPicker TValue="long" @bind-Value="@_customSatPerVbAmount" CurrencySymbolPlacement="CurrencySymbolPlacement.Suffix" CurrencySymbol=" sat/vb" Min="1" Disabled="@(_selectedMempoolRecommendedFeesType != MempoolRecommendedFeesType.CustomFee)">
-                            <Feedback>
-                                <ValidationError/>
-                            </Feedback>
-                        </NumericPicker>
-                    </div>
-                    <FieldHelp>@(_selectedMempoolRecommendedFeesType != MempoolRecommendedFeesType.CustomFee ? "Fees may change by the time the request is first signed" : "")</FieldHelp>
+                    <FeeRateSelector @bind-SelectedFeeType="@_selectedMempoolRecommendedFeesType"
+                                     @bind-CustomSatPerVb="@_customSatPerVbAmount" />
                 </EditTemplate>
             </DataGridColumn>
             <DataGridColumn TItem="WalletWithdrawalRequest" Filterable="false" Field="@nameof(WalletWithdrawalRequest.WalletId)" Caption="Signatures Collected" Sortable="false" Displayable="true">
@@ -854,12 +839,6 @@
 
         await GetData();
     }
-    
-    private async Task OnMempoolFeeRateChange(MempoolRecommendedFeesType value)
-    {
-        _selectedMempoolRecommendedFeesType = value;
-        _customSatPerVbAmount = (long?)await NBXplorerService.GetFeesByType(_selectedMempoolRecommendedFeesType) ?? 1;
-    }
 
     private async Task<bool> ValidateBalance(SavedRowItem<WalletWithdrawalRequest, Dictionary<string, object>> arg)
     {
@@ -1587,12 +1566,12 @@
         return false;
     }
 
-    private async Task OnShowNewWalletWithdrawalModal()
+    private Task OnShowNewWalletWithdrawalModal()
     {
         _selectedMempoolRecommendedFeesType = MempoolRecommendedFeesType.FastestFee;
-        await OnMempoolFeeRateChange(_selectedMempoolRecommendedFeesType);
-
+        _customSatPerVbAmount = 1;
         _amount = _minimumWithdrawalAmount;
+        return Task.CompletedTask;
     }
 
     private void OnDestinationAddressChanged(CellEditContext<WalletWithdrawalRequest> context, string text)
diff --git a/src/Shared/BumpfeeModal.razor b/src/Shared/BumpfeeModal.razor
index 2d71eff7..d0959487 100644
--- a/src/Shared/BumpfeeModal.razor
+++ b/src/Shared/BumpfeeModal.razor
@@ -12,26 +12,8 @@
             <Fields Flex="Flex.JustifyContent.Center">
                 <Field>
                     <FieldLabel>New fee rate</FieldLabel>
-                    <div class="d-flex">
-                        <Select TValue="MempoolRecommendedFeesType" SelectedValue="_selectedMempoolRecommendedFeesType" SelectedValueChanged="async (value) => await OnMempoolFeeRateChange(value)">
-                            <SelectGroup Label="Mempool.space fee">
-                                <SelectItem Value="MempoolRecommendedFeesType.FastestFee">Fastest Fee</SelectItem>
-                                <SelectItem Value="MempoolRecommendedFeesType.EconomyFee">Economy Fee</SelectItem>
-                                <SelectItem Value="MempoolRecommendedFeesType.HourFee">Hour Fee</SelectItem>
-                                <SelectItem Value="MempoolRecommendedFeesType.HalfHourFee">Half Hour Fee</SelectItem>
-                            </SelectGroup>
-                            <SelectItem Value="MempoolRecommendedFeesType.CustomFee">Custom</SelectItem>
-                        </Select>
-                        <NumericPicker TValue="long"
-                                    @bind-Value="@_customSatPerVbAmount"
-                                    CurrencySymbolPlacement="CurrencySymbolPlacement.Suffix"
-                                    CurrencySymbol=" sat/vb"
-                                    Min="1"
-                                    Max="200"
-                                    Disabled="@(_selectedMempoolRecommendedFeesType != MempoolRecommendedFeesType.CustomFee)">
-                        </NumericPicker>
-                    </div>
-                    <FieldHelp>@(_selectedMempoolRecommendedFeesType != MempoolRecommendedFeesType.CustomFee ? "Fees may change by the time the request is first signed" : "")</FieldHelp>
+                    <FeeRateSelector @bind-SelectedFeeType="@_selectedMempoolRecommendedFeesType"
+                                     @bind-CustomSatPerVb="@_customSatPerVbAmount" />
                     <FieldLabel class="mt-3">Last fee used</FieldLabel>
                     <div class="d-flex">
                         <Select TValue="MempoolRecommendedFeesType"
@@ -220,9 +202,4 @@
             await _modalRef.Close(CloseReason.UserClosing);
     }
 
-    private async Task OnMempoolFeeRateChange(MempoolRecommendedFeesType value)
-    {
-        _selectedMempoolRecommendedFeesType = value;
-        _customSatPerVbAmount = (long?)await NBXplorerService.GetFeesByType(_selectedMempoolRecommendedFeesType) ?? 1;
-    }
 }
diff --git a/src/Shared/FeeRateSelector.razor b/src/Shared/FeeRateSelector.razor
new file mode 100644
index 00000000..17be26cb
--- /dev/null
+++ b/src/Shared/FeeRateSelector.razor
@@ -0,0 +1,55 @@
+@inject INBXplorerService NBXplorerService
+
+<div class="d-flex @ContainerClass">
+    <div class="transfer-fee-control-column">
+        <Select TValue="@MempoolRecommendedFeesType"
+                SelectedValue="@SelectedFeeType"
+                SelectedValueChanged="@OnFeeTypeChanged">
+            <SelectGroup Label="Mempool.space fee">
+                <SelectItem Value="@MempoolRecommendedFeesType.FastestFee">Fastest Fee</SelectItem>
+                <SelectItem Value="@MempoolRecommendedFeesType.EconomyFee">Economy Fee</SelectItem>
+                <SelectItem Value="@MempoolRecommendedFeesType.HourFee">Hour Fee</SelectItem>
+                <SelectItem Value="@MempoolRecommendedFeesType.HalfHourFee">Half Hour Fee</SelectItem>
+            </SelectGroup>
+            <SelectItem Value="@MempoolRecommendedFeesType.CustomFee">Custom</SelectItem>
+        </Select>
+    </div>
+    <div class="transfer-fee-control-column">
+        <NumericPicker TValue="@long"
+                       Value="@CustomSatPerVb"
+                       ValueChanged="@OnCustomValueChanged"
+                       CurrencySymbolPlacement="@CurrencySymbolPlacement.Suffix"
+                       CurrencySymbol=" sat/vb" Min="1"
+                       Disabled="@(SelectedFeeType != MempoolRecommendedFeesType.CustomFee)">
+            <Feedback>
+                <ValidationError />
+            </Feedback>
+        </NumericPicker>
+    </div>
+</div>
+<FieldHelp>
+    @(SelectedFeeType != MempoolRecommendedFeesType.CustomFee
+        ? "Fees may change by the time the request is first signed" : "")
+</FieldHelp>
+
+@code {
+    [Parameter] public MempoolRecommendedFeesType SelectedFeeType { get; set; }
+    [Parameter] public EventCallback<MempoolRecommendedFeesType> SelectedFeeTypeChanged { get; set; }
+    [Parameter] public long CustomSatPerVb { get; set; } = 1;
+    [Parameter] public EventCallback<long> CustomSatPerVbChanged { get; set; }
+    [Parameter] public string ContainerClass { get; set; } = "";
+
+    private async Task OnFeeTypeChanged(MempoolRecommendedFeesType value)
+    {
+        SelectedFeeType = value;
+        CustomSatPerVb = (long?)await NBXplorerService.GetFeesByType(value) ?? 1;
+        await SelectedFeeTypeChanged.InvokeAsync(SelectedFeeType);
+        await CustomSatPerVbChanged.InvokeAsync(CustomSatPerVb);
+    }
+
+    private async Task OnCustomValueChanged(long value)
+    {
+        CustomSatPerVb = value;
+        await CustomSatPerVbChanged.InvokeAsync(CustomSatPerVb);
+    }
+}
diff --git a/src/Shared/TransferFundsModal.razor b/src/Shared/TransferFundsModal.razor
index 0b3ddee7..8e9ec3c1 100644
--- a/src/Shared/TransferFundsModal.razor
+++ b/src/Shared/TransferFundsModal.razor
@@ -15,7 +15,6 @@
 @inject ISchedulerFactory SchedulerFactory
 @inject IWalletRepository WalletRepository
 @inject ILogger<TransferFundsModal> Logger
-@inject INBXplorerService NBXplorerService
 @inject ICoinSelectionService CoinSelectionService
 
 <Modal @ref="@_transferFundsModal">
@@ -167,48 +166,9 @@
                         <div class="col-12">
                             <Field Width="@Width.Is100">
                                 <FieldLabel>Fee Rate</FieldLabel>
-                                <div class="d-flex w-100 align-items-start">
-                                    <div class="transfer-fee-control-column">
-                                        <Select TValue="@MempoolRecommendedFeesType" Width="@Width.Is100"
-                                                SelectedValue="@_selectedMempoolRecommendedFeesType"
-                                                SelectedValueChanged="@(async (value) => await OnMempoolFeeRateChange(value))">
-                                            <SelectGroup Label="Mempool.space fee">
-                                                <SelectItem Value="@MempoolRecommendedFeesType.FastestFee">Fastest Fee
-                                                </SelectItem>
-                                                <SelectItem Value="@MempoolRecommendedFeesType.EconomyFee">Economy Fee
-                                                </SelectItem>
-                                                <SelectItem Value="@MempoolRecommendedFeesType.HourFee">Hour Fee
-                                                </SelectItem>
-                                                <SelectItem Value="@MempoolRecommendedFeesType.HalfHourFee">Half Hour
-                                                    Fee
-                                                </SelectItem>
-                                            </SelectGroup>
-                                            <SelectItem Value="@MempoolRecommendedFeesType.CustomFee">Custom
-                                            </SelectItem>
-                                        </Select>
-                                    </div>
-                                    <div class="transfer-fee-control-gap"></div>
-                                    <div class="transfer-fee-control-column">
-                                        <NumericPicker TValue="@long" Width="@Width.Is100"
-                                                       @bind-Value="@_customSatPerVbAmount"
-                                                       CurrencySymbolPlacement="@CurrencySymbolPlacement.Suffix"
-                                                       CurrencySymbol=" sat/vb" Min="1"
-                                                       Disabled="@(_selectedMempoolRecommendedFeesType != MempoolRecommendedFeesType.CustomFee)">
-                                            <Feedback>
-                                                <ValidationError />
-                                            </Feedback>
-                                        </NumericPicker>
-                                    </div>
-                                </div>
-                                <div class="row">
-                                    <Field Width="@Width.Is100">
-                                        <FieldHelp>
-                                            @(_selectedMempoolRecommendedFeesType !=
-                                                MempoolRecommendedFeesType.CustomFee ?
-                                                          "Fees may change by the time the request is first signed" : "")
-                                        </FieldHelp>
-                                    </Field>
-                                </div>
+                                <FeeRateSelector @bind-SelectedFeeType="@_selectedMempoolRecommendedFeesType"
+                                                 @bind-CustomSatPerVb="@_customSatPerVbAmount"
+                                                 ContainerClass="transfer-fee-control-gap" />
                             </Field>
                         </div>
                     </div>
@@ -675,7 +635,7 @@ _amountToTransfer;
         _sourceWalletSelectionDisabled = wallet != null;
 
         _selectedMempoolRecommendedFeesType = MempoolRecommendedFeesType.FastestFee;
-        await OnMempoolFeeRateChange(_selectedMempoolRecommendedFeesType);
+        _customSatPerVbAmount = 1;
 
         await GetAvailableUTXOsForWallet(wallet);
 
@@ -734,10 +694,4 @@ _amountToTransfer;
     {
         return _selectedUTXOs.Sum(x => ((Money)x.Value).ToUnit(MoneyUnit.BTC));
     }
-
-    private async Task OnMempoolFeeRateChange(MempoolRecommendedFeesType value)
-    {
-        _selectedMempoolRecommendedFeesType = value;
-        _customSatPerVbAmount = (long?)await NBXplorerService.GetFeesByType(_selectedMempoolRecommendedFeesType) ?? 1;
-    }
 }
diff --git a/src/wwwroot/css/site.css b/src/wwwroot/css/site.css
index 8f70dece..bc36edf8 100644
--- a/src/wwwroot/css/site.css
+++ b/src/wwwroot/css/site.css
@@ -265,8 +265,7 @@ a,
 }
 
 .transfer-fee-control-gap {
-    width: 60px;
-    flex: 0 0 60px;
+    gap: 60px;
 }
 
 .btn-login:hover {