Toggle the flashlight with the B button/menu button instead of the trigger so it won't toggle when you unholster it.