diff --git a/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/components/amount_selection/AmountSelectionController.java b/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/components/amount_selection/AmountSelectionController.java
index b74b2ee17a..5082f88e76 100644
--- a/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/components/amount_selection/AmountSelectionController.java
+++ b/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/components/amount_selection/AmountSelectionController.java
@@ -551,12 +551,7 @@ private void setMinBaseFromQuote() {
     }
 
     private void applyQuote() {
-        if (model.getMaxOrFixedBaseSideAmount() == null) {
-            setMaxOrFixedBaseFromQuote();
-            setMinBaseFromQuote();
-        } else {
-            setMaxOrFixedQuoteFromBase();
-            setMinQuoteFromBase();
-        }
+        setMaxOrFixedBaseFromQuote();
+        setMinBaseFromQuote();
     }
 }
diff --git a/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/trade_wizard/TradeWizardController.java b/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/trade_wizard/TradeWizardController.java
index 9ddae79122..21d55ef3e1 100644
--- a/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/trade_wizard/TradeWizardController.java
+++ b/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/trade_wizard/TradeWizardController.java
@@ -155,10 +155,8 @@ public void onActivate() {
                 tradeWizardSelectOfferController::setQuoteSideAmountSpec);
         priceSpecPin = EasyBind.subscribe(tradeWizardAmountAndPriceController.getPriceSpec(),
                 priceSpec -> {
-                    if (!model.isCreateOfferMode()) {
-                        tradeWizardAmountAndPriceController.updateQuoteSideAmountSpecWithPriceSpec(priceSpec);
-                        tradeWizardSelectOfferController.setPriceSpec(priceSpec);
-                    }
+                    tradeWizardAmountAndPriceController.updateQuoteSideAmountSpecWithPriceSpec(priceSpec);
+                    tradeWizardSelectOfferController.setPriceSpec(priceSpec);
                 });
         selectedBisqEasyOfferPin = EasyBind.subscribe(tradeWizardSelectOfferController.getSelectedBisqEasyOffer(),
                 selectedBisqEasyOffer -> {
diff --git a/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/trade_wizard/amount/TradeWizardAmountController.java b/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/trade_wizard/amount/TradeWizardAmountController.java
index 648a521c88..949c61eed8 100644
--- a/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/trade_wizard/amount/TradeWizardAmountController.java
+++ b/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/trade_wizard/amount/TradeWizardAmountController.java
@@ -270,14 +270,7 @@ public void onActivate() {
         applyAmountSpec();
 
         if (model.isCreateOfferMode()) {
-            model.getPriceTooltip().set(Res.get("bisqEasy.component.amount.baseSide.tooltip.btcAmount.marketPrice"));
-//            Optional<PriceQuote> marketPriceQuote = getMarketPriceQuote();
-//            if (model.getPriceQuote().get() != null && marketPriceQuote.isPresent()
-//                    && !model.getPriceQuote().get().equals(marketPriceQuote.get())) {
-//                model.getPriceTooltip().set(Res.get("bisqEasy.component.amount.baseSide.tooltip.btcAmount.selectedPrice"));
-//            } else {
-//                model.getPriceTooltip().set(Res.get("bisqEasy.component.amount.baseSide.tooltip.btcAmount.marketPrice"));
-//            }
+            model.getPriceTooltip().set(Res.get("bisqEasy.component.amount.baseSide.tooltip.btcAmount.selectedPrice"));
         } else {
             // Use best price of matching offer if any match found, otherwise market price.
             Optional<String> bestOffersPriceTooltip = findBestOfferQuote()
diff --git a/i18n/src/main/resources/bisq_easy.properties b/i18n/src/main/resources/bisq_easy.properties
index 858d452089..7bef62eb7e 100644
--- a/i18n/src/main/resources/bisq_easy.properties
+++ b/i18n/src/main/resources/bisq_easy.properties
@@ -134,6 +134,7 @@ bisqEasy.tradeWizard.amount.amountModel.fixedAmount=Fixed amount
 bisqEasy.tradeWizard.amount.amountModel.rangeAmount=Range amount
 bisqEasy.tradeWizard.amount.description.fixed={0} amount to trade
 bisqEasy.tradeWizard.amount.description.range=Range of {0} amount to trade. MIN-MAX
+bisqEasy.component.amount.baseSide.tooltip.btcAmount.selectedPrice=This is the Bitcoin amount with your selected price.
 bisqEasy.component.amount.baseSide.tooltip.btcAmount.marketPrice=This is the Bitcoin amount with current market price.
 bisqEasy.component.amount.baseSide.tooltip.buyerInfo=Sellers may ask for a higher price as they have costs for acquiring reputation.\n\
   5-15% price premium is common.