#34: Take site context into account when navigating to Control Panel