I am having the same issue but I am using the online version so there is no option to edit the forms directly.
