A PR was started for XWIKI-18046 at https://github.com/xwiki/xwiki-platform/pull/2985 . This PR should also fix this ticket. I decided to wrap changes for both tickets in the same PR because they interact with each other and influence pieces of UI that are fairly close.