Issue #25063:fix duplicate edit