diff --git a/cockatrice/src/decklistmodel.cpp b/cockatrice/src/decklistmodel.cpp
index f26acfe1..fdf222aa 100644
--- a/cockatrice/src/decklistmodel.cpp
+++ b/cockatrice/src/decklistmodel.cpp
@@ -14,7 +14,7 @@
 #include "deck_loader.h"
 
 DeckListModel::DeckListModel(QObject *parent)
-    : QAbstractItemModel(parent)
+    : QAbstractItemModel(parent), lastKnownColumn(1), lastKnownOrder(Qt::AscendingOrder)
 {
     deckList = new DeckLoader;
     connect(deckList, SIGNAL(deckLoaded()), this, SLOT(rebuildTree()));
@@ -251,12 +251,13 @@ QModelIndex DeckListModel::addCard(const QString &cardName, const QString &zoneN
         beginInsertRows(parentIndex, cardTypeNode->size(), cardTypeNode->size());
         cardNode = new DecklistModelCardNode(decklistCard, cardTypeNode);
         endInsertRows();
-        sort(1);
+        sort(lastKnownColumn, lastKnownOrder);
         emitRecursiveUpdates(parentIndex);
         return nodeToIndex(cardNode);
     } else {
         cardNode->setNumber(cardNode->getNumber() + 1);
         QModelIndex ind = nodeToIndex(cardNode);
+        sort(lastKnownColumn, lastKnownOrder);
         emitRecursiveUpdates(ind);
         deckList->updateDeckHash();
         return ind;
@@ -298,6 +299,9 @@ void DeckListModel::sortHelper(InnerDecklistNode *node, Qt::SortOrder order)
 
 void DeckListModel::sort(int column, Qt::SortOrder order)
 {
+    lastKnownColumn = column;
+    lastKnownOrder = order;
+
     emit layoutAboutToBeChanged();
     root->setSortMethod(column);
     sortHelper(root, order);
diff --git a/cockatrice/src/decklistmodel.h b/cockatrice/src/decklistmodel.h
index 2e2c570a..867f090f 100644
--- a/cockatrice/src/decklistmodel.h
+++ b/cockatrice/src/decklistmodel.h
@@ -54,6 +54,8 @@ public:
 private:
     DeckLoader *deckList;
     InnerDecklistNode *root;
+    int lastKnownColumn;
+    Qt::SortOrder lastKnownOrder;
     InnerDecklistNode *createNodeIfNeeded(const QString &name, InnerDecklistNode *parent);
     QModelIndex nodeToIndex(AbstractDecklistNode *node) const;
     void emitRecursiveUpdates(const QModelIndex &index);