Fixes #1926: Little display glitches

Closes #1926

I will fix the `next` branch the same way if this one is accepted.