Backport #25368 by @denyskon
Fix#24846 applying the solution proposed by @silverwind
<details>
<summary>Screenshots</summary>






</details>
Replaces #25335
Co-authored-by: Denys Konovalov <kontakt@denyskon.de>