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 ff31fc0dca..4a991383f7 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
@@ -609,7 +609,7 @@ abstract public class OfferBookView<R extends GridPane, M extends OfferBookViewM
         if (isSelected) {
             updateCurrencyComboBoxFromModel();
             root.requestFocus();
-            updateCreateOfferButton();
+            matchingOffersToggle.setSelected(model.useOffersMatchingMyAccountsFilter);
         }
         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 e59ba45db6..bdd1e05284 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
@@ -231,10 +231,7 @@ abstract class OfferBookViewModel extends ActivatableViewModel {
     protected void activate() {
         filteredItems.addListener(filterItemsListener);
 
-        if (user != null) {
-            disableMatchToggle.set(user.getPaymentAccounts() == null || user.getPaymentAccounts().isEmpty());
-        }
-        useOffersMatchingMyAccountsFilter = !disableMatchToggle.get() && isShowOffersMatchingMyAccounts();
+        updateMatchingAccountToggleState();
 
         fillCurrencies();
         updateSelectedTradeCurrency();
@@ -268,6 +265,7 @@ abstract class OfferBookViewModel extends ActivatableViewModel {
         if (isTabSelected) {
             updateSelectedTradeCurrency();
             filterOffers();
+            updateMatchingAccountToggleState();
         }
     }
 
@@ -561,6 +559,13 @@ abstract class OfferBookViewModel extends ActivatableViewModel {
         fillCurrencies(tradeCurrencies, allCurrencies);
     }
 
+    private void updateMatchingAccountToggleState() {
+        if (user != null) {
+            disableMatchToggle.set(user.getPaymentAccounts() == null || user.getPaymentAccounts().isEmpty());
+        }
+        useOffersMatchingMyAccountsFilter = !disableMatchToggle.get() && isShowOffersMatchingMyAccounts();
+    }
+
     abstract void fillCurrencies(ObservableList<TradeCurrency> tradeCurrencies,
                                  ObservableList<TradeCurrency> allCurrencies);