There's no workaround at the moment but this came up a few weeks ago (see musth's post in this thread) and I sent a feature request to GPSoft as a result.
(IMO it's not a bug but something which could do with an option so that people can choose the behaviour. See my reasoning in the other thread. The important thing is that a request has been sent to GPSoft already so it's with them.)