Surface GUI Buttons

I believe I fixed that a month ago. I’ll double-check.
Edit And of course there it is, in a separate changeset that had never made it into trunk.