Fix entity tool selection when inactive