diff --git a/cockatrice/src/settings/cache_settings.cpp b/cockatrice/src/settings/cache_settings.cpp
index d01742327..c0e595772 100644
--- a/cockatrice/src/settings/cache_settings.cpp
+++ b/cockatrice/src/settings/cache_settings.cpp
@@ -238,6 +238,7 @@ SettingsCache::SettingsCache()
     tabGameSplitterSizes = settings->value("interface/tabgame_splittersizes").toByteArray();
     knownMissingFeatures = settings->value("interface/knownmissingfeatures", "").toString();
     useTearOffMenus = settings->value("interface/usetearoffmenus", true).toBool();
+    cardViewInitialHeight = settings->value("interface/cardViewInitialHeight", 500).toInt();
 
     showShortcuts = settings->value("menu/showshortcuts", true).toBool();
     displayCardNames = settings->value("cards/displaycardnames", true).toBool();
@@ -300,6 +301,12 @@ void SettingsCache::setUseTearOffMenus(bool _useTearOffMenus)
     emit useTearOffMenusChanged(useTearOffMenus);
 }
 
+void SettingsCache::setCardViewInitialHeight(int _cardViewInitialHeight)
+{
+    cardViewInitialHeight = _cardViewInitialHeight;
+    settings->setValue("interface/cardViewInitialHeight", cardViewInitialHeight);
+}
+
 void SettingsCache::setKnownMissingFeatures(const QString &_knownMissingFeatures)
 {
     knownMissingFeatures = _knownMissingFeatures;
diff --git a/cockatrice/src/settings/cache_settings.h b/cockatrice/src/settings/cache_settings.h
index 7c8cc2ec7..cf81473c2 100644
--- a/cockatrice/src/settings/cache_settings.h
+++ b/cockatrice/src/settings/cache_settings.h
@@ -123,6 +123,7 @@ private:
     QString clientVersion;
     QString knownMissingFeatures;
     bool useTearOffMenus;
+    int cardViewInitialHeight;
     int pixmapCacheSize;
     int networkCacheSize;
     int redirectCacheTtl;
@@ -485,6 +486,7 @@ public:
     void setClientVersion(const QString &clientVersion);
     void setKnownMissingFeatures(const QString &_knownMissingFeatures);
     void setUseTearOffMenus(bool _useTearOffMenus);
+    void setCardViewInitialHeight(int _cardViewInitialHeight);
     QString getClientID()
     {
         return clientID;
@@ -501,6 +503,10 @@ public:
     {
         return useTearOffMenus;
     }
+    int getCardViewInitialHeight()
+    {
+        return cardViewInitialHeight;
+    }
     ShortcutsSettings &shortcuts() const
     {
         return *shortcutsSettings;
diff --git a/dbconverter/src/mocks.cpp b/dbconverter/src/mocks.cpp
index 98ac958eb..8e1ad8889 100644
--- a/dbconverter/src/mocks.cpp
+++ b/dbconverter/src/mocks.cpp
@@ -55,6 +55,9 @@ SettingsCache::SettingsCache()
 void SettingsCache::setUseTearOffMenus(bool /* _useTearOffMenus */)
 {
 }
+void SettingsCache::setCardViewInitialHeight(int /* _cardViewInitialHeight */)
+{
+}
 void SettingsCache::setKnownMissingFeatures(const QString & /* _knownMissingFeatures */)
 {
 }
diff --git a/tests/carddatabase/mocks.cpp b/tests/carddatabase/mocks.cpp
index 8f05f7360..ac07028c7 100644
--- a/tests/carddatabase/mocks.cpp
+++ b/tests/carddatabase/mocks.cpp
@@ -59,6 +59,9 @@ SettingsCache::SettingsCache()
 void SettingsCache::setUseTearOffMenus(bool /* _useTearOffMenus */)
 {
 }
+void SettingsCache::setCardViewInitialHeight(int /* _cardViewInitialHeight */)
+{
+}
 void SettingsCache::setKnownMissingFeatures(const QString & /* _knownMissingFeatures */)
 {
 }