Three Sisters - Season 2 Episode 14 Changing Rooms

When Nora and Elliot decide to move in together again, Annie is out of a place to live until Jake offers her his spare room - an arrangement that Gordon isn't thrilled with. Elliot becomes increasingly exasperated by Nora's refusal to agree to marry him again and her insistence that he occupy only one room in her house - an arrangement that makes him feel like a boarder. After a blow-up, he returns home to an unexpected, but pleasant surprise. Meanwhile, inspired by Elliot's situation, Steven begins a campaign to create his own ""guy room"" at his and Bess' home. (from NBC)