diff --git a/src/main/java/forge/control/FControlGameEventHandler.java b/src/main/java/forge/control/FControlGameEventHandler.java
index a8592f2c985..9d8c3f29665 100644
--- a/src/main/java/forge/control/FControlGameEventHandler.java
+++ b/src/main/java/forge/control/FControlGameEventHandler.java
@@ -47,6 +47,7 @@ import forge.game.zone.ZoneType;
 import forge.gui.GuiDialog;
 import forge.gui.SOverlayUtils;
 import forge.gui.framework.SDisplayUtil;
+import forge.gui.framework.SLayoutIO;
 import forge.gui.match.CMatchUI;
 import forge.gui.match.VMatchUI;
 import forge.gui.match.ViewWinLose;
@@ -145,6 +146,7 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
 
         FThreads.invokeInEdtNowOrLater(new Runnable() { @Override public void run() {
             CMatchUI.SINGLETON_INSTANCE.initHandViews(FServer.instance.getLobby().getGuiPlayer());
+            SLayoutIO.loadLayout(null);
             VMatchUI.SINGLETON_INSTANCE.populate();
             for(VHand h : VMatchUI.SINGLETON_INSTANCE.getHands()) {
                 h.getLayoutControl().updateHand();
diff --git a/src/main/java/forge/gui/match/VMatchUI.java b/src/main/java/forge/gui/match/VMatchUI.java
index cf4d23c6b25..4c37155c0ac 100644
--- a/src/main/java/forge/gui/match/VMatchUI.java
+++ b/src/main/java/forge/gui/match/VMatchUI.java
@@ -83,7 +83,7 @@ public enum VMatchUI implements IVTopLevelUI {
             }
         }
 
-     // Add extra players alternatively to existing user/AI field panels.
+        // Add extra players alternatively to existing user/AI field panels.
         for (int i = 2; i < lstCommands.size(); i++) {
             // If already in layout, no need to add again.
             VCommand cmdView = lstCommands.get(i);