diff --git a/Mage.Client/src/main/java/mage/client/cards/DraftGrid.form b/Mage.Client/src/main/java/mage/client/draft/DraftGrid.form
similarity index 83%
rename from Mage.Client/src/main/java/mage/client/cards/DraftGrid.form
rename to Mage.Client/src/main/java/mage/client/draft/DraftGrid.form
index 92525c8b11c..cba1b13da40 100644
--- a/Mage.Client/src/main/java/mage/client/cards/DraftGrid.form
+++ b/Mage.Client/src/main/java/mage/client/draft/DraftGrid.form
@@ -11,6 +11,7 @@
     <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
+    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,44,0,0,1,-112"/>
   </AuxValues>
 
   <Layout>
diff --git a/Mage.Client/src/main/java/mage/client/cards/DraftGrid.java b/Mage.Client/src/main/java/mage/client/draft/DraftGrid.java
similarity index 90%
rename from Mage.Client/src/main/java/mage/client/cards/DraftGrid.java
rename to Mage.Client/src/main/java/mage/client/draft/DraftGrid.java
index 9ebe13dc364..32428a7e588 100644
--- a/Mage.Client/src/main/java/mage/client/cards/DraftGrid.java
+++ b/Mage.Client/src/main/java/mage/client/draft/DraftGrid.java
@@ -1,10 +1,9 @@
-package mage.client.cards;
+package mage.client.draft;
 
 import mage.abilities.icon.CardIconRenderSettings;
 import mage.cards.CardDimensions;
 import mage.cards.MageCard;
 import mage.client.dialog.PreferencesDialog;
-import mage.client.draft.DraftPanel;
 import mage.client.plugins.impl.Plugins;
 import mage.client.util.ClientEventType;
 import mage.client.util.Event;
@@ -19,6 +18,9 @@ import org.apache.log4j.Logger;
 import java.awt.*;
 import java.util.ArrayList;
 import java.util.List;
+import mage.client.cards.BigCard;
+import mage.client.cards.CardEventProducer;
+import mage.client.cards.CardEventSource;
 
 /**
  * Drafting: panel with the picks
@@ -29,24 +31,24 @@ public class DraftGrid extends javax.swing.JPanel implements CardEventProducer {
 
     private static final Logger logger = Logger.getLogger(DraftGrid.class);
 
-    private final DraftPanel parentPanel;
+    private DraftPanel parentPanel;
 
     protected final CardEventSource cardEventSource = new CardEventSource();
     protected BigCard bigCard;
     protected MageCard markedCard;
     protected boolean emptyGrid;
 
-    /**
-     * Creates new form DraftGrid
-     */
-    public DraftGrid(DraftPanel panel) {
+    public DraftGrid() {
         initComponents();
-        parentPanel = panel;
         markedCard = null;
         emptyGrid = true;
 
         // ENABLE picks and other actions
         cardEventSource.addListener(event -> {
+            if (this.parentPanel == null) {
+                this.parentPanel = (DraftPanel) this.getParent();
+            }
+            
             if (event.getEventType() == ClientEventType.CARD_DOUBLE_CLICK
                     || event.getEventType() == ClientEventType.CARD_CLICK) {
                 // There is a protection against picking too early in DraftPanel logic.
@@ -94,6 +96,10 @@ public class DraftGrid extends javax.swing.JPanel implements CardEventProducer {
         }
         this.bigCard = bigCard;
         this.removeAll();
+        
+        if (booster == null) {
+            return;
+        }
 
         int maxRows = 4;
 
@@ -167,12 +173,12 @@ public class DraftGrid extends javax.swing.JPanel implements CardEventProducer {
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
-                layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                        .addGap(0, 400, Short.MAX_VALUE)
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGap(0, 400, Short.MAX_VALUE)
         );
         layout.setVerticalGroup(
-                layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                        .addGap(0, 300, Short.MAX_VALUE)
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGap(0, 300, Short.MAX_VALUE)
         );
     }// </editor-fold>//GEN-END:initComponents
 
diff --git a/Mage.Client/src/main/java/mage/client/draft/DraftPanel.form b/Mage.Client/src/main/java/mage/client/draft/DraftPanel.form
index c30f882c719..d45841ef54c 100644
--- a/Mage.Client/src/main/java/mage/client/draft/DraftPanel.form
+++ b/Mage.Client/src/main/java/mage/client/draft/DraftPanel.form
@@ -527,7 +527,7 @@
     </Container>
     <Component class="mage.client.cards.CardsList" name="draftPicks">
     </Component>
-    <Container class="mage.client.cards.DraftGrid" name="draftBooster">
+    <Container class="mage.client.draft.DraftGrid" name="draftBooster">
       <Properties>
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
           <Border info="org.netbeans.modules.form.compat2.border.LineBorderInfo">
@@ -550,4 +550,4 @@
       </Layout>
     </Container>
   </SubComponents>
-</Form>
+</Form>
\ No newline at end of file
diff --git a/Mage.Client/src/main/java/mage/client/draft/DraftPanel.java b/Mage.Client/src/main/java/mage/client/draft/DraftPanel.java
index 36b4e373d49..f84219ac61b 100644
--- a/Mage.Client/src/main/java/mage/client/draft/DraftPanel.java
+++ b/Mage.Client/src/main/java/mage/client/draft/DraftPanel.java
@@ -559,7 +559,7 @@
          lblPlayer15 = new javax.swing.JLabel();
          lblPlayer16 = new javax.swing.JLabel();
          draftPicks = new mage.client.cards.CardsList();
-         draftBooster = new mage.client.cards.DraftGrid(this);
+         draftBooster = new mage.client.draft.DraftGrid();
 
          draftLeftPane.setBorder(javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.RAISED));
          draftLeftPane.setFocusable(false);
@@ -879,7 +879,7 @@
      private javax.swing.JCheckBox chkPack1;
      private javax.swing.JCheckBox chkPack2;
      private javax.swing.JCheckBox chkPack3;
-     private mage.client.cards.DraftGrid draftBooster;
+     private mage.client.draft.DraftGrid draftBooster;
      private javax.swing.JPanel draftLeftPane;
      private mage.client.cards.CardsList draftPicks;
      private javax.swing.JPanel jPanel1;