Fix up handling of list mode changes a little bit