diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java b/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
index 71232adf1d5..945e57feced 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
@@ -513,6 +513,7 @@ public final class CMatchUI
             layoutControl.initialize();
             layoutControl.update();
         }
+        FloatingCardArea.closeAll();
     }
 
     @Override
@@ -541,6 +542,7 @@ public final class CMatchUI
 
     @Override
     public boolean resetForNewGame() {
+        FloatingCardArea.closeAll();
         return true;
     }
 
diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingCardArea.java b/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingCardArea.java
index 76721c2f04c..38539ccab9f 100644
--- a/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingCardArea.java
+++ b/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingCardArea.java
@@ -61,9 +61,9 @@ public class FloatingCardArea extends CardArea {
         return 40 * player.getId() + zone.hashCode();
     }
     public static void show(final CMatchUI matchUI, final PlayerView player, final ZoneType zone) {
-        int key = getKey(player, zone);
+        final int key = getKey(player, zone);
         FloatingCardArea cardArea = floatingAreas.get(key);
-        if (cardArea == null) {
+        if (cardArea == null || cardArea.getMatchUI() != matchUI) {
             cardArea = new FloatingCardArea(matchUI, player, zone);
             floatingAreas.put(key, cardArea);
         } else {
@@ -71,7 +71,7 @@ public class FloatingCardArea extends CardArea {
         }
         cardArea.showWindow();
     }
-    public static void refresh(PlayerView player, ZoneType zone) {
+    public static void refresh(final PlayerView player, final ZoneType zone) {
         FloatingCardArea cardArea = floatingAreas.get(getKey(player, zone));
         if (cardArea != null) {
             cardArea.setPlayer(player); //ensure player is updated if needed
@@ -90,12 +90,10 @@ public class FloatingCardArea extends CardArea {
         }
     }
     public static void closeAll() {
-        for (FloatingCardArea cardArea : floatingAreas.values()) {
-            cardArea.clear();
-            cardArea.player = null; //avoid keeping around reference to player between games
-            cardArea.title = null;
+        for (final FloatingCardArea cardArea : floatingAreas.values()) {
             cardArea.window.setVisible(false);
         }
+        floatingAreas.clear();
     }
 
     private final ZoneType zone;