fix #36256: layout shift due to courtesy elements
Merge pull request #1407 from MarcSabatella/36256-layout-shift

fix #36256: layout shift due to courtesy elements