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 8471dc20100..5c3222fe31a 100644
--- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
@@ -34,6 +34,7 @@
 
 package mage.client.game;
 
+import java.util.logging.Level;
 import mage.Constants;
 import mage.client.MageFrame;
 import mage.client.cards.Cards;
@@ -60,6 +61,7 @@ import java.awt.event.MouseEvent;
 import java.io.Serializable;
 import java.util.*;
 import java.util.prefs.Preferences;
+import mage.client.components.MageComponents;
 
 /**
  *
@@ -164,6 +166,12 @@ public class GamePanel extends javax.swing.JPanel {
 		for (ShowCardsDialog reveal: revealed.values()) {
 			reveal.hideDialog();
 		}
+        try {
+            Component popupContainer = MageFrame.getUI().getComponent(MageComponents.POPUP_CONTAINER);
+            popupContainer.setVisible(false);
+        } catch (InterruptedException ex) {
+            logger.fatal("popupContainer error:", ex);
+        }
 	}
 
 	public synchronized void showGame(UUID gameId, UUID playerId) {
diff --git a/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java b/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
index a4194c4fec2..630fa8c8e42 100644
--- a/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
+++ b/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
@@ -152,7 +152,7 @@ public class MageActionCallback implements ActionCallback {
                 public void run() {
                     ThreadUtils.sleep(700);
 
-                    if (!popupCard.equals(data.card)) {
+                    if (popupCard == null || !popupCard.equals(data.card)) {
                         return;
                     }