Fix sort menu padding
Merge remote-tracking branch 'upstream/pr/11670' into pr/11670

* upstream/pr/11670:
  Fix sort menu padding