In one aspect, the present disclosure relates to a method and system for performing an adaptive make/break detection technique including adapting make and break thresholds based on the sum of all signals measured on display electrodes when the sum is lower than a respective filtered sum value. The filtered sum values are produced by a fast and slow filter, which correspond to the break and make thresholds respectively. By performing this method, the accuracy of detecting stylus touch-down and lift-off from a display can be improved, even in the presence of confounding factors such as variation in stylus manufacture, user grip, stylus angle, and water on the display.