diff --git a/cockatrice/src/carditem.cpp b/cockatrice/src/carditem.cpp
index dd10e90a4..93d7d7020 100644
--- a/cockatrice/src/carditem.cpp
+++ b/cockatrice/src/carditem.cpp
@@ -341,8 +341,10 @@ void CardItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
     if (event->button() == Qt::RightButton) {
         if (cardMenu)
-            if (!cardMenu->isEmpty())
+            if (!cardMenu->isEmpty()) {
+                owner->updateCardMenu(this);
                 cardMenu->exec(event->screenPos());
+            }
     } else if ((event->button() == Qt::LeftButton) && !settingsCache->getDoubleClickToPlay()) {
         
         bool hideCard = false;
diff --git a/cockatrice/src/player.cpp b/cockatrice/src/player.cpp
index aedcb4f61..b22204993 100644
--- a/cockatrice/src/player.cpp
+++ b/cockatrice/src/player.cpp
@@ -2502,7 +2502,8 @@ void Player::updateCardMenu(const CardItem *card)
                 for (int i = 0; i < aAddCounter.size(); ++i) {
                     cardMenu->addSeparator();
                     cardMenu->addAction(aAddCounter[i]);
-                    cardMenu->addAction(aRemoveCounter[i]);
+                    if (card->getCounters().contains(i))
+                        cardMenu->addAction(aRemoveCounter[i]);
                     cardMenu->addAction(aSetCounter[i]);
                 }
                 cardMenu->addSeparator();