Fix current selection on refresh