diff --git a/cockatrice/src/game/zones/view_zone.cpp b/cockatrice/src/game/zones/view_zone.cpp
index 9da4ecc39..9ebb2ef70 100644
--- a/cockatrice/src/game/zones/view_zone.cpp
+++ b/cockatrice/src/game/zones/view_zone.cpp
@@ -342,6 +342,12 @@ void ZoneViewZone::removeCard(int position)
 
     CardItem *card = cards.takeAt(position);
     card->deleteLater();
+
+    if (cards.isEmpty() && SettingsCache::instance().getCloseEmptyCardView()) {
+        deleteLater();
+        return;
+    }
+
     updateCardIds(REMOVE_CARD);
     reorganizeCards();
 }