Out of the frying pan - S6-E16
Continuity mistake: The amount of hair Samantha shaves off before Smith comes in increases without her shaving any more. She takes off two chunks, he comes in, and when he starts shaving his head, she's suddenly buzzed to a number 2 cut on a whole part of her head.