Shimano 8170 di2 right shifter problem

[Onno]

I replaced the battery in the shifter today for the first time, and now it stops working after a couple of shifts. I'm pretty sure the problem is that I somehow pushed the spring holding the battery in place down when removing the battery, so that now the battery isn't making good contact in the battery holder. When I re-open the battery holder, the battery just drops out, rather than being held in place by the spring.

I've put some tape on the positive side of the battery (to push it down onto the negative contact) and that seems to be working for the moment (i.e. the shifter works for multiple shifts), but I'm hoping there's a better way to fix this.

Anyone had a similar experience?