Fix bug where user could remove the '<Create new row>' row