Taylor Swift says she and her mom have a hobby (or is it a compulsion) in common -- organizing and straightening up around the house whenever they're bored.

Swift returned from filming her guest-starring role on 'CSI: Crime Scene Investigation' in Los Angeles last week to find that her mom had reorganized her bathroom.

"My bathroom is now a magical, wondrous place," the teen superstar writes on her MySpace blog, "with cabinets for storing make-up and hooks on the door for holding scarves. There are even drawers for my hair brushes and incredible little shelves for my towels."

There's also a new shower curtain replacing the one she'd had since 7th grade! Swift says she was happy to see it go.

"It always secretly creeped me out a little," she writes, "because it's all these people standing around and it really looks like they're watching me. Which was weird."

Swift adds that her previous system of keeping her makeup in "organized" piles, worked "17% of the time ... without disastrous results."

And although she found several items that had gone missing through the years, one item she thought she'd lost forever was a Britney Spears poster that had been moved from the bathroom to her bedroom.

"Another AMAZING upgrade," she writes. "This way, I see it more often and it more proudly displays my unwavering devotion to Britney Spears."

Swift's 'CSI' episode is set to air March 5 on CBS. She is also scheduled to appear on an upcoming episode of 'Kathy Griffin:'My Life on the D-List.'

More From TheBoot