Clone Stamp brush preset glitches to Brush Tool

Having an issue where whenever I go to my Brush Presets window, I will click on a saved Clone Stamp preset and it will force itself on to a Brush preset instead.  No matter how many times I click on the Clone Stamp prest, it will revert to the brush.   I have to then choose the Clone preset I wanted, let it go to brush, hit "S" to go back to the Clone Stamp.

I've worked this way for years with no issue until today.  Having the issue in the most current version of Photoshop and Photosohp Beta (as of 02/28/25) as well as the previous version of each. 

Yes, "Include size" and "Include tool" were checked when creating the Clone presets.

I have tried resetting both the Brush tool and Clone Stamp.  I have rest Preferences and reinstalled them. I've tried deleting Photoshop and reinstalling it.  To no avail.