Is there a Better Way to Use Custom Shapes Tool?

Trevor,

I got the idea for putting all the default shapes in one folder from older Photoshop versions that had an All in the

Shape picker flyout menu to load all the default shapes at once.

Photoshop CC 2018

As I have just replied to Jeff's excellent idea of moving all shapes to a single custom folder, I like to use the search bar in the main shapes panel.  IIf I have an issue finding what I know is there, I rename it when I do find it so I can find it more quickly next time.

Shapes, as well as Patterns, Gradients, and Styles, can be dragged out of any group, and dropped into another, or also between two groups. I set my panels up so my favorites are together at the top of the panel.

I put all the Shapes into a single folder.

Even with just the Default shapes plus the Legacy Shapes and More, if you keep them in the folders as shipped with the all the folders open, won't nearly fit on the screen so you can see all of them.