Backport !5702 (fix for #5685) into gtk-4-10

Merged Chun-wei Fan requested to merge cherry-pick-d209f556 into gtk-4-10

Hi,

This is a direct backport of !5702 (merged) for fixing #5685 (closed) in the gtk-4-10 branch.

With blessings, thank you!

Merge request reports