Would that one be "No Time to Die" by chance. Universal should have done everyone a favor and burned that episode before they even considered airing it.
I just love the scence on the golf course - even thinking of it now makes me laugh out loud - when Columbo comes whipping around in the golf cart funny!
I actually liked the supermarket scene even better. That was beautifully choreographic directing, moving the camera around...it looked real. You don't see many scenes like that in TV programs because they are just too complicated, with so many people plus the camera in motion at the same time.