Issue #25063:fix dupicate edit
Merge pull request #558 from garyhgohoos/25063

Issue #25063:fix duplicate edit