Fix breakage to watch panel from 7b6e405