I have the same problem with Prince. Sometimes he drinks so much water that it comes right back out. I don't leave his water bowl full all day long, I usually give it to him periodically. Lately when he drinks his water I have been watching him and when I think his thirst is quenched and he's had enough I don't take his water from him but I direct his attention to something else like a toy, treat, etc. It seems to be working pretty good.