Better Layer Selecting

Cue rant about something that probably only annoys me. When I'm using an icon set in a design, and I try to select an instance of an icon, it does this thing that really bothers me. Using ⌘+Click to select an icon that is in a deeply nested layer, it goes one layer to far and selects the shape directly. Now, if I was designing or editing the icon I would want that, but 99% of the time I am just trying to select the component's root layer so I can swap it out, or change a prop value. So now I have to take another step to select the layer I want.

If this bothers you too, here's what I do to never run into this problem again. I lock the shape's layer and add a transparent background colour to the component's root layer. Side note: If you set the "Opacity" of the background colour to 0 it will not be selectable, but if you set it to 0.001 it will round down to 0 and still be selectable. Now when I use ⌘+Click to select an icon it will always select the root layer. Problem solved! This might only save a fraction of second, but after a 1000 times doing it that savings adds up.