issue #21099: tweaks to grid entry