Retirement tax questions

@DanaB27:  

1. Answer the next questions until you get to “Any Nondeductible Contributions to Your IRA?” and select “Yes” if you had a nondeductible contributions before this tax year.

I don't see this screen, but I get a message that my IRA is non deductible completely and 8606 will be created automatically. Next year when I receive 1099 R I should step 2 right ?