Select the Move Tool. Then up in the options bar, there is an "Auto-Select" checkbox. Check that and it will then attempt to guess which layer you want when you click, based on content.
Based on this thread: Select Layer not Group, there is an additional dropdown option to select group or layer, so try changing that to layer.