Fixed Issue 7284

We were not checking to see if the selection was still valid after repopulated the list.