You can disable the "unlock on approach" in the settings. I did on mine because that annoyed me the same way.

I also turned off lock when walking away. Sometimes I just forget something and have to run back for it...

Car now only locks or unlocks if I push buttons on the fob. That's what I prefer!