diff --git a/Mage.Client/src/main/java/mage/client/cards/CardGrid.java b/Mage.Client/src/main/java/mage/client/cards/CardGrid.java
index 11656e6f166..a2f974f991b 100644
--- a/Mage.Client/src/main/java/mage/client/cards/CardGrid.java
+++ b/Mage.Client/src/main/java/mage/client/cards/CardGrid.java
@@ -78,6 +78,7 @@ public class CardGrid extends javax.swing.JLayeredPane implements MouseListener,
 
     public CardGrid() {
         initComponents();
+        setGUISize();
         setOpaque(false);
     }
 
@@ -90,6 +91,14 @@ public class CardGrid extends javax.swing.JLayeredPane implements MouseListener,
         this.bigCard = null;
     }
 
+    public void changeGUISize() {
+        setGUISize();
+    }
+
+    private void setGUISize() {
+        cardDimension = GUISizeHelper.editorCardDimension;
+    }
+
     @Override
     public void loadCards(CardsView showCards, SortSetting sortSetting, BigCard bigCard, UUID gameId) {
         this.loadCards(showCards, sortSetting, bigCard, gameId, true);
@@ -125,9 +134,6 @@ public class CardGrid extends javax.swing.JLayeredPane implements MouseListener,
     }
 
     private void addCard(CardView card, BigCard bigCard, UUID gameId, boolean drawImage) {
-        if (cardDimension == null) {
-            cardDimension = GUISizeHelper.editorCardDimension;
-        }
         MageCard cardImg = Plugins.getInstance().getMageCard(card, bigCard, cardDimension, gameId, drawImage);
         cards.put(card.getId(), cardImg);
         cardImg.addMouseListener(this);
diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
index d1f4d01a5e2..af2d44eddf0 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
@@ -182,6 +182,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
 
     public void changeGUISize() {
         setGUISize();
+        cardGrid.changeGUISize();
     }
 
     private void setGUISize() {