diff --git a/forge-gui/src/main/java/forge/quest/QuestEventDraft.java b/forge-gui/src/main/java/forge/quest/QuestEventDraft.java
index 62630b05358..921c0e10fac 100644
--- a/forge-gui/src/main/java/forge/quest/QuestEventDraft.java
+++ b/forge-gui/src/main/java/forge/quest/QuestEventDraft.java
@@ -704,22 +704,21 @@ public class QuestEventDraft {
 
         public String getName() {
             if (edition != null) {
-                String blockName = "";
                 if (block == null) {
-                    
-                    // try to determine the block name for this edition if it exists
-                    // to avoid situations where the block name would be different from the first set name
-                    // (e.g. Urza vs. Urza's Saga, Masques vs. Mercadian Masques etc.).
+                    // determine the block name if possible (to avoid cases where the block name is different from the first edition,
+                    // e.g. Urza vs. Urza's Saga, Masques vs. Mercadian Masques, Kamigawa vs. Champions of Kamigawa, etc.)
+                    String blockName = "";
+
                     for (CardBlock cb : FModel.getBlocks()) {
                         if (cb.getSets().contains(edition)) {
                             blockName = cb.getName();
                             break;
                         }
                     }
-                }
 
-                if (!blockName.isEmpty() && blockName != edition.getName()) {
-                    return blockName;
+                    if (!blockName.isEmpty() && blockName != edition.getName()) {
+                        return blockName;
+                    }
                 }
 
                 return edition.getName();