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 a72f190f3ad..0c494ee0e38 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
@@ -295,7 +295,9 @@ public abstract class CardPanelContainer extends SkinnedPanel {
         fromPanel.dispose();
         getCardPanels().remove(fromPanel);
         remove(fromPanel);
-        this.doLayout();
+        if (fromPanel.getAttachedPanels() != null) {
+            this.doLayout();
+        }
         invalidate();
         repaint();
     }
diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java b/forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java
index 20aa32b36ac..d53b9f65797 100644
--- a/forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java
+++ b/forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java
@@ -892,9 +892,6 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
         }
 
         private void addAttachedPanels(final CardPanel panel) {
-            if (panel == null) {
-                return;
-            }
             for (final CardPanel attachedPanel : panel.getAttachedPanels()) {
                 if (panel.getCard() != null && super.add(attachedPanel)) {
                     addAttachedPanels(attachedPanel);