Follow focus on navigation pane

The highlighted object in the navigation pane doesn't follow the active session tab. Very dodgy when you think you are working on a test machine and it's actually production.