Hi Nessa,
I just wrote a long reply which hasn't seemed to have posted. I completely understand how you're feeling - I want my Papillon to stop it too as soon as she's ready.
In a nutshell, my kitten is doing the same and I'm looking in to how to help her.
I've heard that there is some liqued...