Bug 1057498 - Ensure we wait for the image

Danger of yields shown here :) when you forget once you get f'ed up