Improved current item handling on panel update