Yes, it can do a terrific job at getting water spots off glass! I recently had a much unexpected near-full detail involving water spots and on glass it can really work like a charm granted the stains are not too hard or had the chance to bake in the sun/go untreated for a long time.