Fixed Issue 7248

We were not checking to see if the selection was still valid after
repopulated the list, so I added a check.