Switching from mirrored back to normal loses window placement

Is there a way to retain my window placement after switching back from mirroring displays? I frequently have to mirror/un-mirror my two displays in order to screen-share with my laptop, and it dumps all of my application windows on the primary screen. Is there any way to make them snap back to their original position when the 2nd desktop is enabled?