diff --git a/cockatrice/src/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp
index 85633b756..060f5ca6e 100644
--- a/cockatrice/src/game/player/player_actions.cpp
+++ b/cockatrice/src/game/player/player_actions.cpp
@@ -1417,14 +1417,6 @@ void PlayerActions::actSetPT(QList<CardItem *> selectedCards, const QString &pt)
     player->getGame()->getGameEventHandler()->sendGameCommand(prepareGameCommand(commandList), playerid);
 }
 
-void PlayerActions::actDrawArrow()
-{
-    auto *card = player->getGame()->getActiveCard();
-    if (card) {
-        card->drawArrow(Qt::red);
-    }
-}
-
 void PlayerActions::actIncP(QList<CardItem *> selectedCards)
 {
     actIncPT(selectedCards, 1, 0);
@@ -1516,16 +1508,6 @@ void PlayerActions::actSetAnnotation(QList<CardItem *> selectedCards, const QStr
     sendGameCommand(prepareGameCommand(commandList));
 }
 
-void PlayerActions::actAttach()
-{
-    auto *card = player->getGame()->getActiveCard();
-    if (!card) {
-        return;
-    }
-
-    card->drawAttachArrow();
-}
-
 void PlayerActions::actUnattach(QList<CardItem *> selectedCards)
 {
     QList<const ::google::protobuf::Message *> commandList;
diff --git a/cockatrice/src/game/player/player_actions.h b/cockatrice/src/game/player/player_actions.h
index e0825465c..e0b1c461f 100644
--- a/cockatrice/src/game/player/player_actions.h
+++ b/cockatrice/src/game/player/player_actions.h
@@ -197,9 +197,7 @@ public slots:
     void actRequestSetCardCounterDialog(QList<CardItem *> selectedCards, int counterId);
     void actSetCardCounter(QList<CardItem *> selectedCards, int counterId, const QString &counterValue);
     void actIncrementAllCardCounters(QList<CardItem *> cardsToUpdate);
-    void actAttach();
     void actUnattach(QList<CardItem *> selectedCards);
-    void actDrawArrow();
     void actIncPT(QList<CardItem *> selectedCards, int deltaP, int deltaT);
     void actResetPT(QList<CardItem *> selectedCards);
     void actRequestSetPTDialog(QList<CardItem *> selectedCards);
diff --git a/cockatrice/src/game/player/player_event_handler.h b/cockatrice/src/game/player/player_event_handler.h
index 88254119b..44b43c3f1 100644
--- a/cockatrice/src/game/player/player_event_handler.h
+++ b/cockatrice/src/game/player/player_event_handler.h
@@ -267,7 +267,7 @@ signals:
     /** @} */
 
     void cardZoneChanged(CardItem *card, bool sameZone);
-    void requestCardMenuUpdate(const CardItem *card);
+    void requestCardMenuUpdate(CardItem *card);
 
 private:
     /** Owning player instance. */
diff --git a/cockatrice/src/game/player/player_logic.h b/cockatrice/src/game/player/player_logic.h
index aa94dbb53..e6a48af99 100644
--- a/cockatrice/src/game/player/player_logic.h
+++ b/cockatrice/src/game/player/player_logic.h
@@ -66,7 +66,7 @@ signals:
     /** @brief Emitted when the remote playmat (card/params) is updated from player properties. */
     void playmatChanged();
     void newCardAdded(AbstractCardItem *card);
-    void requestCardMenuUpdate(const CardItem *card);
+    void requestCardMenuUpdate(CardItem *card);
     void counterAdded(CounterState *state);
     void counterRemoved(int counterId);
     void rearrangeCounters();
diff --git a/cockatrice/src/game_graphics/player/menu/card_menu.cpp b/cockatrice/src/game_graphics/player/menu/card_menu.cpp
index eda71a2be..769bdd53a 100644
--- a/cockatrice/src/game_graphics/player/menu/card_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/card_menu.cpp
@@ -67,7 +67,7 @@ static QAction *makeAction(QObject *parent, Slot &&slot, bool checkable = false,
     return a;
 }
 
-CardMenu::CardMenu(PlayerGraphicsItem *_player, const CardItem *_card, bool _shortcutsActive)
+CardMenu::CardMenu(PlayerGraphicsItem *_player, CardItem *_card, bool _shortcutsActive)
     : player(_player), card(_card), shortcutsActive(_shortcutsActive)
 {
     const QList<PlayerLogic *> &players = player->getLogic()->getGame()->getPlayerManager()->getPlayers().values();
@@ -108,15 +108,17 @@ CardMenu::CardMenu(PlayerGraphicsItem *_player, const CardItem *_card, bool _sho
     aHide = makeAction(this, [actions, sel]() { actions->actHide(sel()); });
     aReduceLifeByPower = makeAction(this, [actions, sel]() { actions->actReduceLifeByPower(sel()); });
 
-    // Actions that use activeCard, not selection — direct connection
+    // Actions bound to the card this menu was opened for
     aAttach = new QAction(this);
     aDrawArrow = new QAction(this);
+
+    // Actions that use activeCard, not selection — direct connection
     aSelectAll = new QAction(this);
     aSelectRow = new QAction(this);
     aSelectColumn = new QAction(this);
 
-    connect(aAttach, &QAction::triggered, actions, &PlayerActions::actAttach);
-    connect(aDrawArrow, &QAction::triggered, actions, &PlayerActions::actDrawArrow);
+    connect(aAttach, &QAction::triggered, this, &CardMenu::attachCard);
+    connect(aDrawArrow, &QAction::triggered, this, &CardMenu::drawArrow);
     connect(aSelectAll, &QAction::triggered, actions, &PlayerActions::actSelectAll);
     connect(aSelectRow, &QAction::triggered, actions, &PlayerActions::actSelectRow);
     connect(aSelectColumn, &QAction::triggered, actions, &PlayerActions::actSelectColumn);
@@ -501,6 +503,20 @@ void CardMenu::addRelatedCardActions()
     }
 }
 
+void CardMenu::attachCard()
+{
+    if (card) {
+        card->drawAttachArrow();
+    }
+}
+
+void CardMenu::drawArrow()
+{
+    if (card) {
+        card->drawArrow(Qt::red);
+    }
+}
+
 void CardMenu::retranslateUi()
 {
     aSelectAll->setText(tr("&Select All"));
diff --git a/cockatrice/src/game_graphics/player/menu/card_menu.h b/cockatrice/src/game_graphics/player/menu/card_menu.h
index 337d77b3e..2c80483b1 100644
--- a/cockatrice/src/game_graphics/player/menu/card_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/card_menu.h
@@ -27,7 +27,7 @@ signals:
     void cardInfoRequested(const CardRef &cardRef);
 
 public:
-    explicit CardMenu(PlayerGraphicsItem *player, const CardItem *card, bool shortcutsActive);
+    explicit CardMenu(PlayerGraphicsItem *player, CardItem *card, bool shortcutsActive);
     void removePlayer(PlayerLogic *playerToRemove);
     void createTableMenu(bool canModifyCard);
     void createStackMenu(bool canModifyCard);
@@ -53,11 +53,13 @@ public:
 
 private:
     PlayerGraphicsItem *player;
-    const CardItem *card;
+    CardItem *card;
     QList<QPair<QString, int>> playersInfo;
     bool shortcutsActive;
 
     void addRelatedCardActions();
+    void attachCard();
+    void drawArrow();
     void retranslateUi();
     void initContextualPlayersMenu(QMenu *menu, QAction *allPlayersAction);
     void setShortcutsActive();
diff --git a/cockatrice/src/game_graphics/player/menu/player_menu.cpp b/cockatrice/src/game_graphics/player/menu/player_menu.cpp
index 44b184cfe..6a23890ee 100644
--- a/cockatrice/src/game_graphics/player/menu/player_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/player_menu.cpp
@@ -87,7 +87,7 @@ void PlayerMenu::setMenusForGraphicItems()
     }
 }
 
-QMenu *PlayerMenu::updateCardMenu(const CardItem *card)
+QMenu *PlayerMenu::updateCardMenu(CardItem *card)
 {
     if (!card) {
         emit cardMenuUpdated(nullptr);
diff --git a/cockatrice/src/game_graphics/player/menu/player_menu.h b/cockatrice/src/game_graphics/player/menu/player_menu.h
index 97dd2fc56..27a5efe7e 100644
--- a/cockatrice/src/game_graphics/player/menu/player_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/player_menu.h
@@ -43,7 +43,7 @@ signals:
 
 public slots:
     void setMenusForGraphicItems();
-    QMenu *updateCardMenu(const CardItem *card);
+    QMenu *updateCardMenu(CardItem *card);
 
 private slots:
     void refreshShortcuts();