Fixes #5304 make the whole close button clickable