[core] Sidebar selection fix