diff --git a/desktop/src/main/java/bisq/desktop/main/offer/OfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/OfferView.java
index 2499faf9b8..7439889021 100644
--- a/desktop/src/main/java/bisq/desktop/main/offer/OfferView.java
+++ b/desktop/src/main/java/bisq/desktop/main/offer/OfferView.java
@@ -250,32 +250,32 @@ public abstract class OfferView extends ActivatableView<TabPane, Void> {
                 }
                 if (viewClass == BtcOfferBookView.class) {
                     btcOfferBookView = (BtcOfferBookView) viewLoader.load(BtcOfferBookView.class);
-                    btcOfferBookTab.setContent(btcOfferBookView.getRoot());
                     btcOfferBookView.setOfferActionHandler(offerActionHandler);
                     btcOfferBookView.setDirection(direction);
-                    tabPane.getSelectionModel().select(btcOfferBookTab);
                     btcOfferBookView.onTabSelected(true);
+                    tabPane.getSelectionModel().select(btcOfferBookTab);
+                    btcOfferBookTab.setContent(btcOfferBookView.getRoot());
                 } else if (viewClass == BsqOfferBookView.class) {
                     bsqOfferBookView = (BsqOfferBookView) viewLoader.load(BsqOfferBookView.class);
                     bsqOfferBookView.setOfferActionHandler(offerActionHandler);
                     bsqOfferBookView.setDirection(direction);
+                    bsqOfferBookView.onTabSelected(true);
                     tabPane.getSelectionModel().select(bsqOfferBookTab);
                     bsqOfferBookTab.setContent(bsqOfferBookView.getRoot());
-                    bsqOfferBookView.onTabSelected(true);
                 } else if (viewClass == TopAltcoinOfferBookView.class) {
                     topAltcoinOfferBookView = (TopAltcoinOfferBookView) viewLoader.load(TopAltcoinOfferBookView.class);
                     topAltcoinOfferBookView.setOfferActionHandler(offerActionHandler);
                     topAltcoinOfferBookView.setDirection(direction);
+                    topAltcoinOfferBookView.onTabSelected(true);
                     tabPane.getSelectionModel().select(topAltcoinOfferBookTab);
                     topAltcoinOfferBookTab.setContent(topAltcoinOfferBookView.getRoot());
-                    topAltcoinOfferBookView.onTabSelected(true);
                 } else if (viewClass == OtherOfferBookView.class) {
                     otherOfferBookView = (OtherOfferBookView) viewLoader.load(OtherOfferBookView.class);
                     otherOfferBookView.setOfferActionHandler(offerActionHandler);
                     otherOfferBookView.setDirection(direction);
+                    otherOfferBookView.onTabSelected(true);
                     tabPane.getSelectionModel().select(otherOfferBookTab);
                     otherOfferBookTab.setContent(otherOfferBookView.getRoot());
-                    otherOfferBookView.onTabSelected(true);
                 }
             }
         }
diff --git a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java b/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java
index d5a2c9525e..ff31fc0dca 100644
--- a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java
+++ b/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java
@@ -601,11 +601,15 @@ abstract public class OfferBookView<R extends GridPane, M extends OfferBookViewM
     }
 
     public void onTabSelected(boolean isSelected) {
+        if (model.isTabSelected == isSelected) {
+            return;
+        }
         model.onTabSelected(isSelected);
 
         if (isSelected) {
             updateCurrencyComboBoxFromModel();
             root.requestFocus();
+            updateCreateOfferButton();
         }
         updateCreateOfferButton();
     }
diff --git a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java b/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java
index 8e9753dea8..e59ba45db6 100644
--- a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java
+++ b/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java
@@ -136,7 +136,7 @@ abstract class OfferBookViewModel extends ActivatableViewModel {
 
     PaymentMethod selectedPaymentMethod = getShowAllEntryForPaymentMethod();
 
-    private boolean isTabSelected;
+    boolean isTabSelected;
     final BooleanProperty showAllTradeCurrenciesProperty = new SimpleBooleanProperty(true);
     final BooleanProperty disableMatchToggle = new SimpleBooleanProperty();
     final IntegerProperty maxPlacesForAmount = new SimpleIntegerProperty();