This is one of the reasons I've never liked (and never used) Spaces. I think this would be a better solution, even if it meant making the max number of spaces be four.