Remove the need to listen for tab state change