#6201 edit mode working