I've noticed the same problem in separating work from procrastination environments. But it might work if it was asymmetric - say, there's a single fast hotkey to go from procrastination mode to work mode, but you have to type a password to go in the other direction. (Or better yet, a 5 second delay timer that you can cancel.)