Add a retry and a focus check to make sure we select the right view