Sort the status columns in a two-dimentional filter statistics portlet

I am asking for a more logical and consistent sort of status columns when doing a two-dimentional filter statistics portlet.

Currently, when I choose Status for one of the sides of the portlet, the bug statuses are listed as follows:

Resolved
Closed
(Bug) Open - Review
(Bug) Work - Waiting
(Bug) Work - In Work
(Bug) Work - Rework
(Bug) Deferred - Review

When I do one for Admin Tasks instead of bugs, the order of the Status columns is:

Resolved
Closed
(Admin task) Open - Review
(Admin Task) Work - Rework
(Admin Task) Work - In Work
(Admin Task) Permission Needed
(Admin Task) Work - Waiting

Notice the difference between bugs and admin tasks? It should sort with the workflow so that the columns are in order (regardless of whether or not it's a bug or an admin task):

Open - Review
Work - Waiting
Work - In Work
Work - Rework
Resolved
Closed