A pedicure chair with a basin having an auto-fill system for depositing water into the basin while eliminating spillover is disclosed. The auto-fill system has a controller, a water supply valve, and a water level sensor. The water level sensor can be a proximity sensor attached to an external surface of the basin. The water level sensor can send a signal to a controller when the water level sensor detects a predetermined water level in the basin. The controller can be configured to shut on and off the water supply to the basin by sending a signal to actuate the water supply valve.