Playlist Position When Stopped

I've got a playlist I watch exclusively with over 5,000 items. When I stop the playlist from playing (pressing the square stop button on remote), the item stops and XBMC returns to the playlist listing. However, XBMC has highlighted the title where I started playing rather than the item that I just stopped. The only way to stop and keep your place is to hit 'MENU' while item is playing and get to the playlist and then hit stop. This wouldn't be so bad a workaround if the AppleTV I'm running XBMC on wasn't sooooooo sloooooooow at dealing with the huge playlist (any performance tips?).

In a nutshell, when I hit "STOP" while playing a playlist, can you have XBMC return to the playlist at the stopped point?

Thanks for all the hard work on xbmc.

Best,
Guitardood