Back button behavior improved in GenreSelection