Now the list appears correctly and doesn't glitch anymore, this also improve the keyboard navigation with (tab to switch to the next element):wq (cherry picked from commit 44d2aad2)
