diff --git a/cockatrice/src/dialogs/dlg_move_top_cards_until.cpp b/cockatrice/src/dialogs/dlg_move_top_cards_until.cpp
index f93cbfe9d..4f0207155 100644
--- a/cockatrice/src/dialogs/dlg_move_top_cards_until.cpp
+++ b/cockatrice/src/dialogs/dlg_move_top_cards_until.cpp
@@ -59,8 +59,8 @@ DlgMoveTopCardsUntil::DlgMoveTopCardsUntil(QWidget *parent, QString _expr, uint
  */
 static bool matchExistsInDb(const FilterString &filterString)
 {
-    const auto cardDatabase = CardDatabaseManager::getInstance();
-    const auto allCards = cardDatabase->getCardList();
+    const auto *cardDatabase = CardDatabaseManager::getInstance();
+    const auto &allCards = cardDatabase->getCardList();
 
     const auto it = std::find_if(allCards.begin(), allCards.end(),
                                  [&filterString](const CardInfoPtr &card) { return filterString.check(card); });
diff --git a/cockatrice/src/game/cards/card_database.h b/cockatrice/src/game/cards/card_database.h
index 0962bd350..83ea647d3 100644
--- a/cockatrice/src/game/cards/card_database.h
+++ b/cockatrice/src/game/cards/card_database.h
@@ -477,9 +477,9 @@ public:
     CardSetPtr getSet(const QString &setName);
     bool isProviderIdForPreferredPrinting(const QString &cardName, const QString &providerId);
     static CardInfoPerSet getSetInfoForCard(const CardInfoPtr &_card);
-    QList<CardInfoPtr> getCardList() const
+    const CardNameMap &getCardList() const
     {
-        return cards.values();
+        return cards;
     }
     SetList getSetList() const;
     LoadStatus loadFromFile(const QString &fileName);