[Finish #64207100] …and finally, make the X button work