Updated the focus on popup forms