diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/CollectionViewerPanel.java b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/CollectionViewerPanel.java
index 02a089548c..d528e0d126 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/CollectionViewerPanel.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/CollectionViewerPanel.java
@@ -27,6 +27,7 @@
 */
 package mage.client.deckeditor.collection.viewer;
 
+import mage.client.MageFrame;
 import mage.client.cards.BigCard;
 import mage.client.util.sets.ConstructedFormats;
 
@@ -42,6 +43,7 @@ import java.awt.event.ActionListener;
  */
 public final class CollectionViewerPanel extends JPanel {
 
+    private static String LAYOYT_CONFIG_KEY = "collectionViewerLayoutConfig";
 
     public CollectionViewerPanel() {
         initComponents();
@@ -73,22 +75,26 @@ public final class CollectionViewerPanel extends JPanel {
         jPanel1.add(label2);
 
         small3x3 = new JRadioButton("3x3");
-        small3x3.setSelected(true);
+        boolean selected3x3 = MageFrame.getPreferences().get(LAYOYT_CONFIG_KEY, MageBook.LAYOUT_3x3).equals(MageBook.LAYOUT_3x3);
+        small3x3.setSelected(selected3x3);
         small3x3.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
                 big4x4.setSelected(false);
-                mageBook.updateSize("small");
+                mageBook.updateSize(MageBook.LAYOUT_3x3);
+                MageFrame.getPreferences().put(LAYOYT_CONFIG_KEY, MageBook.LAYOUT_3x3);
             }
         });
         jPanel1.add(small3x3);
 
         big4x4 = new JRadioButton("4x4");
+        big4x4.setSelected(!selected3x3);
         big4x4.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
                 small3x3.setSelected(false);
-                mageBook.updateSize("big");
+                mageBook.updateSize(MageBook.LAYOUT_4x4);
+                MageFrame.getPreferences().put(LAYOYT_CONFIG_KEY, MageBook.LAYOUT_4x4);
             }
         });
         jPanel1.add(big4x4);
diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java
index 444b2c648c..af6dbf95fb 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java
@@ -61,6 +61,10 @@ import java.util.UUID;
  * @author nantuko
  */
 public class MageBook extends JComponent {
+    
+    public static final String LAYOUT_3x3 = "small";
+    
+    public static final String LAYOUT_4x4 = "big";
 
     public MageBook(BigCard bigCard) {
         super();
@@ -315,14 +319,16 @@ public class MageBook extends JComponent {
     }
 
     public void updateSize(String size) {
-        if (size.equals("small")) {
+        if (size.equals(LAYOUT_3x3)) {
             this.conf = new _3x3Configuration();
 
-        } else if (size.equals("big")) {
+        } else if (size.equals(LAYOUT_4x4)) {
             this.conf = new _4x4Configuration();
         } else {
             return;
         }
+        currentPage = 0;
+        pageLeft.setVisible(false);
         setSize(conf.WIDTH, conf.HEIGHT);
         setPreferredSize(new Dimension(conf.WIDTH, conf.HEIGHT));
         setMinimumSize(new Dimension(conf.WIDTH, conf.HEIGHT));
@@ -393,7 +399,7 @@ public class MageBook extends JComponent {
     private HoverButton pageRight;
 
     private int currentPage = 0;
-    private String currentSet = "DKA";
+    private String currentSet = "AVR";
 
     private static CardDimensions cardDimensions = new CardDimensions(1.2d);
     private static final Logger log = Logger.getLogger(MageBook.class);