Battery wrap ... yes, that can solve the problem.

I've not had this problem with my P-7 lights but I did with another flashlight, and it fixed it. Quick and easy, and never mode-shifted again.