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 4a991383f7..f3a1d9dc84 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
@@ -733,7 +733,7 @@ abstract public class OfferBookView<R extends GridPane, M extends OfferBookViewM
 
     private void onEditOpenOffer(Offer offer) {
         OpenOffer openOffer = model.getOpenOffer(offer);
-        if (openOffer != null) {
+        if (model.isBootstrappedOrShowPopup() && openOffer != null) {
             navigation.navigateToWithData(openOffer, MainView.class, PortfolioView.class, EditOfferView.class);
         }
     }