It's so hard to know what to do in public! Sounds like you handled it well though. I don't think he should have a grace period, gentle discipline all the way. If you let him do it for X amount of time he'll get confused when you suddenly start disciplining him. Could he be doing it for attention?