This really fixes #7957.  It now really moves out of the way for the picture.