diff --git a/common/src/states/charged_ranged.rs b/common/src/states/charged_ranged.rs
index 9f8be59235..ea57674868 100644
--- a/common/src/states/charged_ranged.rs
+++ b/common/src/states/charged_ranged.rs
@@ -64,7 +64,11 @@ pub struct Data {
 impl Data {
     /// How complete the charge is, on a scale of 0.0 to 1.0
     pub fn charge_frac(&self) -> f32 {
-        (self.timer.as_secs_f32() / self.static_data.charge_duration.as_secs_f32()).min(1.0)
+        if let StageSection::Charge = self.stage_section {
+            (self.timer.as_secs_f32() / self.static_data.charge_duration.as_secs_f32()).min(1.0)
+        } else {
+            0.0
+        }
     }
 }
 
diff --git a/voxygen/src/scene/camera.rs b/voxygen/src/scene/camera.rs
index 9f018445e5..fc34f8c93b 100644
--- a/voxygen/src/scene/camera.rs
+++ b/voxygen/src/scene/camera.rs
@@ -42,6 +42,7 @@ pub struct Camera {
     ori: Vec3<f32>,
     tgt_dist: f32,
     dist: f32,
+    tgt_fov: f32,
     fov: f32,
     aspect: f32,
     mode: CameraMode,
@@ -76,6 +77,7 @@ impl Camera {
             ori: Vec3::zero(),
             tgt_dist: 10.0,
             dist: 10.0,
+            tgt_fov: 1.1,
             fov: 1.1,
             aspect,
             mode,
@@ -222,6 +224,14 @@ impl Camera {
             );
         }
 
+        if (self.fov - self.tgt_fov).abs() > 0.01 {
+            self.fov = f32::lerp(
+                self.fov,
+                self.tgt_fov,
+                0.65 * (delta as f32) / self.interp_time(),
+            );
+        }
+
         if (self.focus - self.tgt_focus).magnitude_squared() > 0.001 {
             let lerped_focus = Lerp::lerp(
                 self.focus,
@@ -290,7 +300,7 @@ impl Camera {
     pub fn get_fov(&self) -> f32 { self.fov }
 
     /// Set the field of view of the camera in radians.
-    pub fn set_fov(&mut self, fov: f32) { self.fov = fov; }
+    pub fn set_fov(&mut self, fov: f32) { self.tgt_fov = fov; }
 
     /// Set the FOV in degrees
     pub fn set_fov_deg(&mut self, fov: u16) {
diff --git a/voxygen/src/session/mod.rs b/voxygen/src/session/mod.rs
index edc1653dfe..3133a024f6 100644
--- a/voxygen/src/session/mod.rs
+++ b/voxygen/src/session/mod.rs
@@ -72,6 +72,7 @@ pub struct SessionState {
     target_entity: Option<specs::Entity>,
     selected_entity: Option<(specs::Entity, std::time::Instant)>,
     interactable: Option<Interactable>,
+    saved_zoom_dist: Option<f32>,
 }
 
 /// Represents an active game session (i.e., the one being played).
@@ -118,6 +119,7 @@ impl SessionState {
             target_entity: None,
             selected_entity: None,
             interactable: None,
+            saved_zoom_dist: None,
         }
     }
 
@@ -298,17 +300,20 @@ impl PlayState for SessionState {
             let client = self.client.borrow();
             let player_entity = client.entity();
 
-            let fov_scaling = {
-                if let Some(comp::CharacterState::ChargedRanged(cr)) = client
-                    .state()
-                    .read_storage::<comp::CharacterState>()
-                    .get(player_entity)
-                {
-                    1.0 - 3.0 * cr.charge_frac() / 4.0
-                } else {
-                    1.0
+            let mut fov_scaling = 1.0;
+            if let Some(comp::CharacterState::ChargedRanged(cr)) = client
+                .state()
+                .read_storage::<comp::CharacterState>()
+                .get(player_entity)
+            {
+                fov_scaling -= 3.0 * cr.charge_frac() / 4.0;
+                if self.saved_zoom_dist.is_none() {
+                    self.saved_zoom_dist = Some(camera.get_distance());
+                    camera.set_distance(0.0);
                 }
-            };
+            } else if let Some(dist) = self.saved_zoom_dist.take() {
+                camera.set_distance(dist);
+            }
             camera.set_fov((global_state.settings.graphics.fov as f32 * fov_scaling).to_radians());
 
             // Compute camera data