diff --git a/Mage.Client/src/main/java/mage/client/game/GamePanel.java b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
index 5d7ec878aac..4508045ac9f 100644
--- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
@@ -1177,7 +1177,7 @@ public final class GamePanel extends javax.swing.JPanel {
             }
         }
         updateGame(gameView);
-        Map<String, Serializable> options0 = options == null ? new HashMap<String, Serializable>() : options;
+        Map<String, Serializable> options0 = options == null ? new HashMap<>() : options;
         ShowCardsDialog dialog = null;
         if (cardView != null && cardView.size() > 0) {
             dialog = showCards(message, cardView, required, options0, popupMenuType);
@@ -2346,7 +2346,6 @@ public final class GamePanel extends javax.swing.JPanel {
         return gameChatPanel.getText();
     }
 
-
     public Map<String, Card> getLoadedCards() {
         return loadedCards;
     }
diff --git a/Mage.Common/src/mage/view/CardsView.java b/Mage.Common/src/mage/view/CardsView.java
index eb93fe3f1d1..f36ba02d9b5 100644
--- a/Mage.Common/src/mage/view/CardsView.java
+++ b/Mage.Common/src/mage/view/CardsView.java
@@ -42,6 +42,7 @@ import mage.game.Game;
 import mage.game.GameState;
 import mage.game.command.Emblem;
 import mage.game.permanent.Permanent;
+import mage.game.permanent.PermanentToken;
 import mage.target.targetpointer.TargetPointer;
 import mage.util.GameLog;
 
@@ -86,7 +87,14 @@ public class CardsView extends LinkedHashMap<UUID, CardView> {
                     if (sourceObject == null) {
                         sourceObject = game.getPermanent(ability.getSourceId());
                     }
-                    isCard = true;
+                    if (sourceObject == null) {
+                        sourceObject = game.getObject(ability.getSourceId());
+                        if (sourceObject instanceof PermanentToken) {
+                            isPermanent = true;
+                        }
+                    } else {
+                        isCard = true;
+                    }
                     break;
                 case BATTLEFIELD:
                     sourceObject = game.getPermanent(ability.getSourceId());