@Phaedrux I'm having the same problem, my DWC is 3.4.4.
I looked at the release notes for 3.5 Beta2 and I saw a fix for the OK button but nothing on the Cancel button.

I finally have everything working as I want it so maybe someone that is testing 3.5 Beta2 can check this on their machine.

Thanks,

Jeffery