What do you do if your friend's partner makes you uncomfortable?

He pokes me, touches me and says things that make me really uncomfortable, right in front of her.

I guess I can mention something to her but that feels uncomfortable too

Right now I just try to keep track of where he is so that I can keep my distance from him, but it's not always a solution as sometimes he sneaks up on me