[#1] Fixed crash going back from edit activity