diff --git a/core/src/com/unciv/ui/pickerscreens/PromotionPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/PromotionPickerScreen.kt
index dd3ab805c1..c4c7027ba1 100644
--- a/core/src/com/unciv/ui/pickerscreens/PromotionPickerScreen.kt
+++ b/core/src/com/unciv/ui/pickerscreens/PromotionPickerScreen.kt
@@ -40,6 +40,7 @@ class PromotionPickerScreen(val unit: MapUnit) : PickerScreen() {
         val canBePromoted = unit.promotions.canBePromoted()
         val canChangeState = game.worldScreen.canChangeState
         val canPromoteNow = canBePromoted && canChangeState
+                && unit.currentMovement > 0 && unit.attacksThisTurn == 0
         if (!canPromoteNow)
             rightSideButton.isEnabled = false