The back button does not change the active shortcut link (when overlay is being used)

Reported originally by @webchick at #610234: Overlay implementation:

When I click Add content, then Find content, then hit the back button, my active shortcut link doesn't change back to Add content again.

I can reproduce.