diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanelContainer.java b/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanelContainer.java
index ffdba61a8f6..3e34ac8272f 100644
--- a/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanelContainer.java
+++ b/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanelContainer.java
@@ -292,13 +292,19 @@ public abstract class CardPanelContainer extends SkinnedPanel {
             remove(CardPanel.getDragAnimationPanel());
             setMouseDragPanel(null);
         }
+        
+        boolean selected = fromPanel != null && fromPanel.isSelected();
+        
         hoveredPanel = null;
         fromPanel.dispose();
         getCardPanels().remove(fromPanel);
         remove(fromPanel);
         invalidate();
         repaint();
-        FView.SINGLETON_INSTANCE.getFrame().repaint(); // necessary to get rid of lingering visual artifacts (e.g. unneeded targeting arrows)
+
+        if (selected) {
+            FView.SINGLETON_INSTANCE.getFrame().repaint(); // necessary to get rid of lingering visual artifacts (e.g. unneeded targeting arrows)
+        }
     }
 
     public final void setCardPanels(final List<CardPanel> cardPanels) {