Make edit mode inline add self contained as to not mess with later edits. #428