Do not reset sort order when switching list

Related to #3519.