diff --git a/src/client/handle_input.rs b/src/client/handle_input.rs
index d62b243..34cb7c6 100644
--- a/src/client/handle_input.rs
+++ b/src/client/handle_input.rs
@@ -1,7 +1,11 @@
 use std::{f32::consts::PI, time::Duration};
 
 use nalgebra::Rotation3;
-use winit::{dpi::LogicalPosition, keyboard::KeyCode as Key, window::CursorGrabMode};
+use winit::{
+    dpi::{LogicalPosition, PhysicalPosition},
+    keyboard::KeyCode as Key,
+    window::CursorGrabMode,
+};
 
 use super::Client;
 
@@ -12,24 +16,34 @@ impl Client<'_> {
         if input.just_pressed(Key::Escape) {
             if let Some(window) = &self.window {
                 self.grabbed_cursor = !self.grabbed_cursor;
-                let mode = if self.grabbed_cursor {
+                if self.grabbed_cursor {
                     window.set_cursor_visible(false);
-                    CursorGrabMode::Locked
+                    window
+                        .set_cursor_grab(CursorGrabMode::Locked)
+                        .map(|_| {
+                            self.keep_cursor = false;
+                        })
+                        .or_else(|_| {
+                            self.keep_cursor = true;
+                            window.set_cursor_grab(CursorGrabMode::Confined)
+                        })
+                        .expect("wah");
                 } else {
+                    self.keep_cursor = false;
                     window.set_cursor_visible(true);
-                    CursorGrabMode::None
+                    window.set_cursor_grab(CursorGrabMode::None).expect("wah");
                 };
-                #[cfg(not(target_os = "windows"))]
-                window.set_cursor_grab(mode).expect("wah");
             }
             return;
         }
         if self.grabbed_cursor {
             if let Some(window) = &self.window {
-                let size = window.inner_size();
-                window
-                    .set_cursor_position(LogicalPosition::new(size.width / 2, size.height / 2))
-                    .expect("wah");
+                if self.keep_cursor {
+                    let size = window.inner_size();
+                    window
+                        .set_cursor_position(PhysicalPosition::new(size.width / 2, size.height / 2))
+                        .expect("wah");
+                }
             }
             let delta = input.mouse_delta;
             if delta.x != 0.0 {
diff --git a/src/client/mod.rs b/src/client/mod.rs
index cc4ef0e..4c0463c 100644
--- a/src/client/mod.rs
+++ b/src/client/mod.rs
@@ -26,6 +26,7 @@ pub struct Client<'a> {
     prev_frame: Instant,
     prev_update: Instant,
     grabbed_cursor: bool,
+    keep_cursor: bool,
 }
 
 impl Client<'_> {
@@ -41,6 +42,7 @@ impl Client<'_> {
             prev_update: Instant::now(),
             target: Instant::now(),
             grabbed_cursor: false,
+            keep_cursor: false,
         }
     }