diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java
index 96623177e4..53ccce0809 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java
@@ -181,18 +181,22 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
     @Override
     protected void activate() {
         currencyComboBox.setItems(model.getTradeCurrencies());
+        currencyComboBox.setVisibleRowCount(Math.min(currencyComboBox.getItems().size(), 25));
+        currencyComboBox.setOnAction(e -> model.onSetTradeCurrency(currencyComboBox.getSelectionModel().getSelectedItem()));
 
         if (model.showAllTradeCurrenciesProperty.get())
             currencyComboBox.getSelectionModel().select(0);
         else
             currencyComboBox.getSelectionModel().select(model.getSelectedTradeCurrency());
 
-        currencyComboBox.setVisibleRowCount(Math.min(currencyComboBox.getItems().size(), 25));
-        paymentMethodComboBox.setItems(model.getPaymentMethods());
-        paymentMethodComboBox.getSelectionModel().select(0);
 
-        currencyComboBox.setOnAction(e -> model.onSetTradeCurrency(currencyComboBox.getSelectionModel().getSelectedItem()));
+        paymentMethodComboBox.setItems(model.getPaymentMethods());
         paymentMethodComboBox.setOnAction(e -> model.onSetPaymentMethod(paymentMethodComboBox.getSelectionModel().getSelectedItem()));
+        if (model.showAllPaymentMethods)
+            paymentMethodComboBox.getSelectionModel().select(0);
+        else
+            paymentMethodComboBox.getSelectionModel().select(model.selectedPaymentMethod);
+
         createOfferButton.setOnAction(e -> onCreateOffer());
 
         volumeColumn.textProperty().bind(createStringBinding(
@@ -212,11 +216,9 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
 
         model.getOfferList().comparatorProperty().bind(tableView.comparatorProperty());
 
-
         tableView.setItems(model.getOfferList());
         priceColumn.setSortType((model.getDirection() == Offer.Direction.BUY) ? TableColumn.SortType.ASCENDING : TableColumn.SortType.DESCENDING);
         tableView.sort();
-
     }
 
     @Override
diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModel.java
index 0b94c7b1a6..14fec4d038 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModel.java
@@ -88,13 +88,13 @@ class OfferBookViewModel extends ActivatableViewModel {
 
     // If id is empty string we ignore filter (display all methods)
 
-    private PaymentMethod selectedPaymentMethod = new PaymentMethod(SHOW_ALL_FLAG, 0, 0, null);
+    PaymentMethod selectedPaymentMethod = new PaymentMethod(SHOW_ALL_FLAG, 0, 0, null);
 
     private final ObservableList<OfferBookListItem> offerBookListItems;
     private final ListChangeListener<OfferBookListItem> listChangeListener;
     private boolean isTabSelected;
     final BooleanProperty showAllTradeCurrenciesProperty = new SimpleBooleanProperty();
-    private boolean showAllPaymentMethods = true;
+    boolean showAllPaymentMethods = true;
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -242,7 +242,7 @@ class OfferBookViewModel extends ActivatableViewModel {
 
     public ObservableList<PaymentMethod> getPaymentMethods() {
         ObservableList<PaymentMethod> list = FXCollections.observableArrayList(PaymentMethod.ALL_VALUES);
-        list.add(0, selectedPaymentMethod);
+        list.add(0, new PaymentMethod(SHOW_ALL_FLAG, 0, 0, null));
         return list;
     }