diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf7a7a15a4..6395a379d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Server kicks old client when a user is trying to log in again (often the case when a user's original connection gets dropped)
 - Added a raycast check to beams to prevent their effect applying through walls
 - Flying agents raycast more angles to check for obstacles.
+- Mouse Cursor now stays in the same position when menu is not open
 
 ## [0.9.0] - 2021-03-20
 
diff --git a/voxygen/src/window.rs b/voxygen/src/window.rs
index 66f409a0d4..10eb09fc10 100644
--- a/voxygen/src/window.rs
+++ b/voxygen/src/window.rs
@@ -1036,7 +1036,17 @@ impl Window {
                 self.events.push(Event::Focused(state));
             },
             WindowEvent::CursorMoved { position, .. } => {
-                self.cursor_position = position;
+                if self.cursor_grabbed {
+                    if let Err(err) = self
+                        .window
+                        .window()
+                        .set_cursor_position(self.cursor_position)
+                    {
+                        error!("Error setting cursor position: {:?}", err);
+                    }
+                } else {
+                    self.cursor_position = position;
+                }
             },
             WindowEvent::MouseWheel { delta, .. } if self.cursor_grabbed && self.focused => {
                 const DIFFERENCE_FROM_DEVICE_EVENT_ON_X11: f32 = -15.0;