Fix possible hang with Go To panel