I think you've hit the nail on the head because if you say thats enough and he stops you are almost there its become a habit. So keep saying no as soon as it starts.