diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.form b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.form
index 4a31ea1bf87..508d28bc2fe 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.form
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.form
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.3" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <AuxValues>
@@ -35,7 +35,7 @@
               <EmptySpace max="-2" attributes="0"/>
               <Component id="jScrollPane1" pref="273" max="32767" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
-              <Component id="jPanel1" min="-2" pref="35" max="-2" attributes="0"/>
+              <Component id="jPanel1" min="-2" max="-2" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
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 c9d0d8fd623..f199c15d7fe 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
@@ -89,7 +89,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
         cardGrid = new CardGrid();
         makeTransparent();
         initListViewComponents();
-        currentView = mainModel; // by default we use List View
+        currentView = mainModel; // by default we use List View        
     }
 
     public void makeTransparent() {
@@ -143,6 +143,20 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
             }
         });
     }
+    
+    public void switchToGrid(){
+        jToggleListView.setSelected(false);
+        jToggleCardView.setSelected(true);
+        currentView = cardGrid;
+        jScrollPane1.setViewportView(cardGrid);
+        cbSortBy.setEnabled(true);
+        chkPiles.setEnabled(true);
+        jButtonAddToMain.setEnabled(false);
+        jButtonAddToSideboard.setEnabled(false);
+        filterCards();
+        chkPiles.setSelected(true);
+        this.currentView.drawCards((SortBy) cbSortBy.getSelectedItem(), chkPiles.isSelected());
+    }
 
     public void loadSideboard(List<Card> sideboard, BigCard bigCard) {
         this.bigCard = bigCard;
@@ -154,7 +168,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
         for (Card card: sideboard) {
             this.cards.add(card);
         }
-
+        switchToGrid();
         filterCards();
     }