better behavior when editing