diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java
index c7a4bffc26f..a55294051b8 100644
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java
@@ -225,7 +225,7 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
                                     group.isCollapsed = !group.isCollapsed;
                                     btnExpandCollapseAll.updateIsAllCollapsed();
                                     clearSelection(); //must clear selection since indices and visible items will be changing
-                                    updateLayout(false);
+                                    updateLayout(true);
                                 }
                                 break;
                             }
diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorDraftingProcess.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorDraftingProcess.java
index 72c8d6ea065..bc2f3580ac7 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorDraftingProcess.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorDraftingProcess.java
@@ -300,7 +300,7 @@ public class CEditorDraftingProcess extends ACEditorBase<PaperCard, DeckGroup> {
      */
     @Override
     public boolean canSwitchAway(boolean isClosing) {
-        if (isClosing && !saved) {
+        if (isClosing && !saved && this.boosterDraft.hasNextChoice()) {
             String userPrompt = localizer.getMessage("lblEndDraftConfirm");
             return FOptionPane.showConfirmDialog(userPrompt, localizer.getMessage("lblLeaveDraft"), localizer.getMessage("lblLeave"), localizer.getMessage("lblCancel"), false);
         }