diff --git a/desktop/src/main/java/bisq/desktop/app/BisqApp.java b/desktop/src/main/java/bisq/desktop/app/BisqApp.java
index b4f5d24d75b..12328a1b61a 100644
--- a/desktop/src/main/java/bisq/desktop/app/BisqApp.java
+++ b/desktop/src/main/java/bisq/desktop/app/BisqApp.java
@@ -40,6 +40,7 @@
 import bisq.core.dao.governance.voteresult.MissingDataRequestService;
 import bisq.core.filter.FilterManager;
 import bisq.core.locale.Res;
+import bisq.core.offer.OpenOffer;
 import bisq.core.offer.OpenOfferManager;
 import bisq.core.user.Preferences;
 
@@ -326,7 +327,14 @@ private void addSceneKeyEventHandler(Scene scene, Injector injector) {
     }
 
     private void shutDownByUser() {
-        if (injector.getInstance(OpenOfferManager.class).getObservableList().isEmpty()) {
+        boolean hasOpenOffers = false;
+        for (OpenOffer openOffer : injector.getInstance(OpenOfferManager.class).getObservableList()) {
+            if (openOffer.getState().equals(OpenOffer.State.AVAILABLE)) {
+                hasOpenOffers = true;
+                break;
+            }
+        }
+        if (!hasOpenOffers) {
             // No open offers, so no need to show the popup.
             stop();
             return;