diff --git a/src/main/java/forge/gui/match/QuestWinLoseHandler.java b/src/main/java/forge/gui/match/QuestWinLoseHandler.java
index 8dae68d6e43..1a408aff738 100644
--- a/src/main/java/forge/gui/match/QuestWinLoseHandler.java
+++ b/src/main/java/forge/gui/match/QuestWinLoseHandler.java
@@ -24,6 +24,7 @@ import forge.Singletons;
 import forge.control.FControl;
 
 import forge.card.BoosterData;
+import forge.card.CardEdition;
 import forge.card.UnOpenedProduct;
 import forge.game.GameEndReason;
 import forge.game.GameFormat;
@@ -632,11 +633,15 @@ public class QuestWinLoseHandler extends ControlWinLose {
             }
 
             final String setPrompt = "Choose bonus booster set:";
-            final String chSet = GuiChoose.one(setPrompt, chooseSets);
+            List<CardEdition> chooseEditions = new ArrayList<CardEdition>();
+            for (String ed : chooseSets) {
+                chooseEditions.add(Singletons.getModel().getEditions().get(ed));
+            }
+            final CardEdition chooseEd = GuiChoose.one(setPrompt, chooseEditions);
 
-            cardsWon = (new UnOpenedProduct(Singletons.getModel().getBoosters().get(chSet))).open();
+            cardsWon = (new UnOpenedProduct(Singletons.getModel().getBoosters().get(chooseEd.getCode()))).open();
             qData.getCards().addAllCards(cardsWon);
-            this.lblTemp1 = new TitleLabel("Bonus \"" + chSet + "\" booster pack!");
+            this.lblTemp1 = new TitleLabel("Bonus " + chooseEd.getName() + " booster pack!");
         }
 
         if (cardsWon != null) {
diff --git a/src/main/java/forge/quest/data/GameFormatQuest.java b/src/main/java/forge/quest/data/GameFormatQuest.java
index 1722cba9027..684a2d58d62 100644
--- a/src/main/java/forge/quest/data/GameFormatQuest.java
+++ b/src/main/java/forge/quest/data/GameFormatQuest.java
@@ -204,9 +204,9 @@ public final class GameFormatQuest {
     public boolean isSetLegal(final String setCode) {
         return this.allowedSetCodes.isEmpty() || this.allowedSetCodes.contains(setCode);
     }
-    
+
     /**
-     * Checks if the current format contains sets with snow-land (horrible hack...)
+     * Checks if the current format contains sets with snow-land (horrible hack...).
      * @return boolean, contains snow-land sets.
      * 
      */