diff --git a/forge-gui/src/main/java/forge/match/AbstractGuiGame.java b/forge-gui/src/main/java/forge/match/AbstractGuiGame.java
index 54f2b22c8f6..61061453bcf 100644
--- a/forge-gui/src/main/java/forge/match/AbstractGuiGame.java
+++ b/forge-gui/src/main/java/forge/match/AbstractGuiGame.java
@@ -89,8 +89,13 @@ public abstract class AbstractGuiGame implements IGuiGame, IMayViewCards {
         if (player == null || gameController == null) {
             throw new IllegalArgumentException();
         }
+
+        final boolean doSetCurrentPlayer = originalGameControllers.isEmpty();
         originalGameControllers.put(player, gameController);
         gameControllers.put(player, gameController);
+        if (doSetCurrentPlayer) {
+            setCurrentPlayer(player);
+        }
     }
 
     @Override