Fixed bug causing focus to fire twice