2020 Roth IRA Excess contribution refunded in 2021 - shows up on 2023 TT as an Contribution

In 2020 I made an excess Contribution to my Roth IRA.  It was reported as an excess contribution and I received a refund, and a 1099-R in 2021.  I reported the 1099-R in 2021, through TT Home and Business.  I filled out the form as the 1099-R was reported, and yet while finishing my 2023 taxes the amount of the excess is showing up as a Roth Contribution, and if I try to zero it out through the step-by-step update it doesn't change it to zero.  What did I enter wrong in previous years?  I don't remember this problem in 2022 but I was surprised to see it this year.