fix for watch handlers not showing element buttons