Fixes: U4-5616 Cannot sort tabs/groups