I think (although I can't confirm) that if you walk out of the surface and then walk back in again it updates itself properly. I should think, though, that it'd be a fairly manageable problem to solve coding-wise... it's really pretty frustrating tbh.
