Popup close class should persist