Fixes #440 When switching bookmark, the new current bookmark does not become 'active'.

Created originally on Bitbucket by colin-hurley (Colin Hurley)

Was already merged in Bitbucket before import, marked as merged by the import user

Special thanks to Emmanuel Rosa, who provided an explanation of the problem cause and the original fix upon which this changeset is based.