Sounds like your switch isn't set correctly, or it's sticking. you could try removing it and WD'ing it, but I'd replace it as they're only about £6, and once it's out, you might as well know that there's nothing wrong with it.
Check out the Haynes manual how to do it, but note that the switch is a bit of a bugger to get at, and the locknut to "fix" it is 10 times worse!
you will swear a lot before you've got it right!, trust me, been there, done that!
Whilst you've got the linkage in view, make sure you lubricate all the pins and pivots etc. the plunger in the g/box caseing does dry up.