Fixed the focus issue for real this time!