Added focus on popup location change