How to quickly change shape color?

Hi,

I am struggling with a problem since months, now I decided to ask for a solution (or maybe I'm doing it wrong!).

1) I create a live shape (like a rectangle)

2) I want to change the shape color, so I click on the fill (or stroke) color in shape properties tab, the swatches panel comes out

3) I want to try a color that it's not in the swatches so I click the color picker icon

4) When  i change colors in the picker I can't see the color changing "live" on the shape as I move but I have to click "OK" to see the color applied.

This is not working well, as you know most of the time you need to view the color on the shape as you change it in the picker.

As a workaround I always use the "color overlay" layer style as it changes the color "live" as I move in the color picker, but obviously it's not the same thing.

Is there a correct way to do this directly with live shape color attribute, or is it a flaw in photoshop ui?

Thanks !