Added extra condition for tabwatch