Yeah, that's the current logic.  But changing it should be easy enough, and I agree that it's a nicer flow.