Under Options : Gameplay there is an option for “Autoselect Character After Combat”. This might be relevant or not. Try it and let us know.