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 37bd78db9cc..3c6d2f3bfe7 100644
--- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
@@ -307,12 +307,9 @@ public final class GamePanel extends javax.swing.JPanel {
 
         if (jLayeredPane!= null) {
             jLayeredPane.remove(abilityPicker);
-        }
-        this.abilityPicker.cleanUp();
-
-        if (jLayeredPane != null) {
             jLayeredPane.remove(DialogManager.getManager(gameId));
         }
+        this.abilityPicker.cleanUp();
         DialogManager.removeGame(gameId);
 
         if (pickNumber != null) {