Fixed keyboard focus issues after popup windows are closed