diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45c8a9b226..5b21edd215 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,8 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Added context-sensitive crosshair
+
 ### Changed
 
+- Improved camera aiming
+
 ### Removed
 
 ## [0.6.0] - 2020-05-16
diff --git a/voxygen/src/session.rs b/voxygen/src/session.rs
index 9ccd8c34ba..ff67858882 100644
--- a/voxygen/src/session.rs
+++ b/voxygen/src/session.rs
@@ -175,7 +175,14 @@ impl PlayState for SessionState {
                     .map(|cs| cs.is_aimed())
                     .unwrap_or(false);
 
-                (is_aiming, if is_aiming { Vec3::unit_z() * 0.025 } else { Vec3::zero() })
+                (
+                    is_aiming,
+                    if is_aiming {
+                        Vec3::unit_z() * 0.025
+                    } else {
+                        Vec3::zero()
+                    },
+                )
             };
 
             let cam_dir: Vec3<f32> = Vec3::from(view_mat.inverted() * -Vec4::unit_z());