UI-3360: Bad UI when clicking sub-category of one category
Merge commit '97daf47220cb029746223679953894b32e4b7756' into HEAD