diff --git a/cockatrice/src/game/board/arrow_item.cpp b/cockatrice/src/game/board/arrow_item.cpp
index 430ea6adc..7a3a7dd35 100644
--- a/cockatrice/src/game/board/arrow_item.cpp
+++ b/cockatrice/src/game/board/arrow_item.cpp
@@ -318,8 +318,14 @@ void ArrowAttachItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
         CardItem *targetCard = qgraphicsitem_cast<CardItem *>(targetItem);
         CardZone *targetZone = targetCard->getZone();
 
+        // move card onto table first if attaching from some other zone
+        if (startZone->getName() != "table") {
+            auto info = startCard->getInfo();
+            player->playCardToTable(startCard, false, info ? info->getCipt() : false);
+        }
+
         Command_AttachCard cmd;
-        cmd.set_start_zone(startZone->getName().toStdString());
+        cmd.set_start_zone("table");
         cmd.set_card_id(startCard->getId());
         cmd.set_target_player_id(targetZone->getPlayer()->getId());
         cmd.set_target_zone(targetZone->getName().toStdString());
diff --git a/cockatrice/src/game/player/player.cpp b/cockatrice/src/game/player/player.cpp
index d6cfe98cc..02c493291 100644
--- a/cockatrice/src/game/player/player.cpp
+++ b/cockatrice/src/game/player/player.cpp
@@ -2666,6 +2666,46 @@ void Player::playCard(CardItem *card, bool faceDown, bool tapped)
     sendGameCommand(cmd);
 }
 
+/**
+ * Like {@link Player::playCard}, but forces the card to be played to the table zone.
+ * Cards with tablerow 3 (the stack) will be played to tablerow 1 (the noncreatures row).
+ */
+void Player::playCardToTable(CardItem *card, bool faceDown, bool tapped)
+{
+    if (card == nullptr) {
+        return;
+    }
+
+    Command_MoveCard cmd;
+    cmd.set_start_player_id(card->getZone()->getPlayer()->getId());
+    cmd.set_start_zone(card->getZone()->getName().toStdString());
+    cmd.set_target_player_id(getId());
+    CardToMove *cardToMove = cmd.mutable_cards_to_move()->add_card();
+    cardToMove->set_card_id(card->getId());
+
+    CardInfoPtr info = card->getInfo();
+    if (!info) {
+        return;
+    }
+
+    int tableRow = faceDown ? 2 : info->getTableRow();
+    // default instant/sorcery cards to the noncreatures row
+    if (tableRow > 2) {
+        tableRow = 1;
+    }
+
+    QPoint gridPoint = QPoint(-1, TableZone::clampValidTableRow(2 - tableRow));
+    cardToMove->set_face_down(faceDown);
+    if (!faceDown) {
+        cardToMove->set_pt(info->getPowTough().toStdString());
+    }
+    cardToMove->set_tapped(faceDown ? false : tapped);
+    cmd.set_target_zone("table");
+    cmd.set_x(gridPoint.x());
+    cmd.set_y(gridPoint.y());
+    sendGameCommand(cmd);
+}
+
 void Player::addCard(CardItem *card)
 {
     emit newCardAdded(card);
diff --git a/cockatrice/src/game/player/player.h b/cockatrice/src/game/player/player.h
index 484e509d7..e8d149e42 100644
--- a/cockatrice/src/game/player/player.h
+++ b/cockatrice/src/game/player/player.h
@@ -390,6 +390,7 @@ public:
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 
     void playCard(CardItem *c, bool faceDown, bool tapped);
+    void playCardToTable(CardItem *c, bool faceDown, bool tapped);
     void addCard(CardItem *c);
     void deleteCard(CardItem *c);
     void addZone(CardZone *z);