Methods are provided for fabricating electrochromic devices that mitigate formation of short circuits under a top bus bar without predetermining where top bus bars will be applied on the device. Devices fabricated using such methods may be deactivated under the top bus bar, or may include active material under the top bus bar. Methods of fabricating devices with active material under a top bus bar include depositing a modified top bus bar, fabricating self-healing layers in the electrochromic device, and modifying a top transparent conductive layer of the device prior to applying bus bars.