I had the same problem on my MK6.

I replaced the indicator and wiper stalk unit, took about 10min and the part only cost a fiver from a scrappy.

hope this helps.