diff --git a/forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java b/forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java
index 5a4757b92a7..768c5192008 100644
--- a/forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java
+++ b/forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java
@@ -13,6 +13,7 @@ import javax.swing.WindowConstants;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
+import forge.card.CardStateName;
 import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.base.Function;
@@ -165,7 +166,24 @@ public class GuiChoose {
                                 if (paper == null) {
                                     paper = FModel.getMagicDb().getVariantCards().getUniqueByName(face.getName());
                                 }
-                                matchUI.setCard(paper);
+
+                                if (paper != null && !paper.getName().equals(face.getName())) {
+                                    Card c = Card.getCardForUi(paper);
+                                    boolean foundState = false;
+                                    for (CardStateName cs : c.getStates()) {
+                                        if (c.getState(cs).getName().equals(face.getName())) {
+                                            foundState = true;
+                                            c.setState(cs, true);
+                                            matchUI.setCard(c.getView());
+                                        }
+                                    }
+                                    if (!foundState) {
+                                        matchUI.setCard(paper);
+                                    }
+                                } else {
+                                    matchUI.setCard(paper);
+                                }
+
                                 return;
                             }