I think this is the same problem I had and it’s addressed and filed as an bug?
Bug organizational interface