+1
This has been a pain for way I tend to work as well.