Updated focus for keyboard on close button