Just replied to another commenter with the same feedback, but agreed that there are times where you want to stick with one of those shapes.

Double click on the shape in the toolbar to keep it selected!