Fixing toplevel organizer highlights.