When editing forwarding address, navigation still displays Marketplace as active page

When purchasing a contract, if the user clicks edit forwarding address, they are brought to the Utilities page. However, the left side navigation seems to think the user is still on the marketplace page. This is confusing and doesn't allow the user to easily get back to the marketplace page, since the nav item for the current page is disabled.