Keep menu at same item after playback

Is there a way to keep Kodi from popping up to the first menu item in a TV Show after the playback of a video? For example, I play an episode of a TV show from Season 4 Episode 6. When that episode ends, the menu comes back set to the first item in the list rather than S04E07. There is a setting in the Media Settings -> Videos to “Select first unwatched TV show season/episode,” which I have set to “Never.” I don’t see any other item that might cover this and this “Never” setting doesn’t have any effect. It’s making me a little crazy! I use Amber skin, but it also does this in Estuary. Any ideas?