[BugFix] Fix #606: Unexpected behaviour of edit form