diff --git a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java
index 3ff1be70372..4d41d51d864 100644
--- a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java
+++ b/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java
@@ -254,7 +254,10 @@ protected void activate() {
         maybeShowClearXchangeWarning();
 
         if (!model.isRange()) {
-            showNextStepAfterAmountIsSet();
+            nextButton.setVisible(false);
+            cancelButton1.setVisible(false);
+            if (model.isOfferAvailable.get())
+                showNextStepAfterAmountIsSet();
         }
 
         if (CurrencyUtil.isFiatCurrency(model.getOffer().getCurrencyCode())) {
@@ -418,6 +421,9 @@ private void onShowPayFundsScreen() {
         cancelButton1.setVisible(false);
         cancelButton1.setManaged(false);
         cancelButton1.setOnAction(null);
+        offerAvailabilityBusyAnimation.stop();
+        offerAvailabilityLabel.setVisible(false);
+        offerAvailabilityLabel.setManaged(false);
 
 
         model.onShowPayFundsScreen();
@@ -455,7 +461,6 @@ private void onShowPayFundsScreen() {
                     .show();
         }
 
-        offerAvailabilityBusyAnimation.stop();
         cancelButton2.setVisible(true);
 
         waitingForFundsBusyAnimation.play();
@@ -585,8 +590,11 @@ private void addSubscriptions() {
         });
 
         isOfferAvailableSubscription = EasyBind.subscribe(model.isOfferAvailable, isOfferAvailable -> {
-            if (isOfferAvailable)
+            if (isOfferAvailable) {
                 offerAvailabilityBusyAnimation.stop();
+                if (!model.isRange() && !model.showPayFundsScreenDisplayed.get())
+                    showNextStepAfterAmountIsSet();
+            }
 
             offerAvailabilityLabel.setVisible(!isOfferAvailable);
             offerAvailabilityLabel.setManaged(!isOfferAvailable);