Next/Previous button 'sort' key fix