Issue #20715: Added remove, still need scrolling