I guess the easiest solution is to always show the subcategory selector.
We were trying to be smart by hiding it when the subcategories are listed below, but it makes the navigation inconsistent.