diff --git a/Mage.Client/src/main/java/mage/client/cards/CardsList.java b/Mage.Client/src/main/java/mage/client/cards/CardsList.java
index 9e810589209..8ae8daaeec0 100644
--- a/Mage.Client/src/main/java/mage/client/cards/CardsList.java
+++ b/Mage.Client/src/main/java/mage/client/cards/CardsList.java
@@ -81,15 +81,11 @@ public class CardsList extends javax.swing.JPanel implements MouseListener {
     }
 
 	public void loadCards(CardsView showCards, BigCard bigCard, UUID gameId) {
-		loadCards(showCards, bigCard, gameId, SortBy.UNSORTED);
-	}
-
-	public void loadCards(CardsView showCards, BigCard bigCard, UUID gameId, SortBy sortBy) {
 		//FIXME: why we remove all cards? for performance it's better to merge changes
 		cards = showCards;
 		this.bigCard = bigCard;
 		this.gameId = gameId;
-		drawCards(sortBy);
+		drawCards((SortBy) cbSortBy.getSelectedItem());
 	}
 
 	private void drawCards(SortBy sortBy) {
diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/DeckArea.java b/Mage.Client/src/main/java/mage/client/deckeditor/DeckArea.java
index 7be22adb2e2..46feff417c1 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/DeckArea.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/DeckArea.java
@@ -62,9 +62,9 @@ public class DeckArea extends javax.swing.JPanel {
 	}
 
 	public void loadDeck(Deck deck, BigCard bigCard) {
-			deckList.loadCards(new CardsView(deck.getCards()), bigCard, null, SortBy.NAME);
-			if (sideboardList.isVisible())
-				sideboardList.loadCards(new CardsView(deck.getSideboard()), bigCard, null, SortBy.NAME);
+		deckList.loadCards(new CardsView(deck.getCards()), bigCard, null);
+		if (sideboardList.isVisible())
+			sideboardList.loadCards(new CardsView(deck.getSideboard()), bigCard, null);
 	}
 
 	public void addDeckEventListener(Listener<Event> listener) {