Swatch picker changing color of Solid Color Layer. Not desired.

I recently upgraded from PS 2017 to PS 2020 with the installation of a newer Mac OS.  One behavior has changed that messes up my workflow.

I used Solid Color Layers with Masks often. I would create a Red Solid Color Layer and then choose from grayscale swatches to give the BRUSH the color to paint with on the mask. However, in PS 2020, when I click the swatch, it changes the color of BOTH the brush and Solid Color Layer.  PS 2017 did NOT have this behavior.  How can I stop the swatch from changing the color of the Solid Color Layer? (In PS 2017, you had to double-click the Solid Color swatch in the Layers palette to do so.)

It really slows down my work flow, considering the only workaround it to click OFF the Color Layer, choose the color for the brush, and then go back to the Original Color Layer (and I have a number of them, so I have to take a second to make sure I click the right one).

Thanks!