How do I stop the pick tool from changing to a shape tool after I select an object?

After I select an object with the pick tool, it automatically changes to the shape tool. This seems to started after I re-installed my 2018 version. I never really use the shape tool. Is there a way to change this setting? Or do I have to hit the space bar after every selected object?

Thanks in advance,