IMHO that's suboptimal solution, being forced to have it expanded at all times. If so, better leave it as it is, so user at least has some choice. I, for one, wouldn't be willing to give up on that screen estate.
Might work, though as you, said doesn't spare on clicks but at least it's explicit. It appears there's no happy-for-all solution.