Equipped focus no longer impacts character energy shield

I don't have Eldrich Battery on, I swap,my staff to my front bar,Wand and focus to my back bar,my es and my damage come back. Then, when I play,come back to town...Have to do it again.So then I'm playing backwards..makes no sense.GGG needs to fix the bug+I have to rearrange my skills every time as well.
I have also tried just running with my Wand/focus on my back bar only without the staff when not fighting bosses. I still have to swap the gear back from front to back bar to get my es and damage to read appropriately...Hope they can fix this soon,before next patch...