...when the category list is empty (cherry picked from commit 8791b72cb1ebdd4b803bbd7d7828630f82fe8a9f)