diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
index c0ea110afe..f3ba39db08 100644
--- a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
+++ b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
@@ -330,8 +330,9 @@ object UnitActions {
             }.takeIf {
                 isFree ||
                 (
-                    unit.civInfo.gold >= goldCostOfUpgrade && !unit.isEmbarked()
-                    && unit.currentMovement == unit.getMaxMovement().toFloat()
+                        unit.civInfo.gold >= goldCostOfUpgrade
+                                && unit.currentMovement > 0
+                                && !unit.isEmbarked()
                 )
             }
         )