diff --git a/src/main/java/forge/gui/match/VMatchUI.java b/src/main/java/forge/gui/match/VMatchUI.java
index 054eadd5aad..02e2709ff7a 100644
--- a/src/main/java/forge/gui/match/VMatchUI.java
+++ b/src/main/java/forge/gui/match/VMatchUI.java
@@ -4,22 +4,15 @@ import java.util.ArrayList;
 import java.util.List;
 
 import javax.swing.JButton;
-import javax.swing.SwingUtilities;
 
 import forge.AllZone;
-import forge.Singletons;
-import forge.gui.framework.DragCell;
 import forge.gui.framework.EDocID;
 import forge.gui.framework.IVDoc;
 import forge.gui.framework.IVTopLevelUI;
 import forge.gui.framework.SLayoutIO;
-import forge.gui.framework.SRearrangingUtil;
 import forge.gui.match.nonsingleton.VField;
 import forge.gui.match.nonsingleton.VHand;
-import forge.gui.match.views.VDev;
 import forge.gui.match.views.VMessage;
-import forge.properties.ForgePreferences.FPref;
-import forge.view.FView;
 
 /** 
  * Top level view class for match UI drag layout.<br>
@@ -42,6 +35,7 @@ public enum VMatchUI implements IVTopLevelUI {
 
     // Other instantiations
     private final CMatchUI control = null;
+    private boolean isPopulated = false;
 
     /** */
     @Override
@@ -51,8 +45,20 @@ public enum VMatchUI implements IVTopLevelUI {
     /** */
     @Override
     public void populate() {
+        if (isPopulated) { return; }
+        else { isPopulated = true; }
         SLayoutIO.loadLayout(null);
 
+        /*System.out.println(SwingUtilities.isEventDispatchThread());
+        final SwingWorker<Void, Void> w = new SwingWorker<Void, Void>() {
+            @Override
+            public Void doInBackground() {
+                SLayoutIO.loadLayout(null);
+                return null;
+            }
+        };
+        w.execute();
+
         // Pull dev mode if necessary, remove parent cell if required.
         if (!Singletons.getModel().getPreferences().getPrefBoolean(FPref.DEV_MODE_ENABLED)) {
             VDev.SINGLETON_INSTANCE.getParentCell().removeDoc(VDev.SINGLETON_INSTANCE);
@@ -68,7 +74,7 @@ public enum VMatchUI implements IVTopLevelUI {
                     }
                 }
             }
-        });
+        });*/
     }
 
     //========== Retrieval methods