Fix #27313 (see the comment) And some UI improvements: ### Before   ### After   