issue #21672: Make picker line up too