diff --git a/crates/fj-viewer/src/display.rs b/crates/fj-viewer/src/display.rs
index 1233b7d92..726235155 100644
--- a/crates/fj-viewer/src/display.rs
+++ b/crates/fj-viewer/src/display.rs
@@ -65,7 +65,9 @@ impl ApplicationHandler for DisplayState {
             window.get_mut()
         } else {
             let window = block_on(Window::new(event_loop)).unwrap();
-            self.windows.entry(window.window().id()).or_insert(window)
+            self.windows
+                .entry(window.winit_window().id())
+                .or_insert(window)
         };
 
         if let Some(mesh) = self.tri_mesh.take() {
@@ -149,7 +151,7 @@ impl ApplicationHandler for DisplayState {
         }
 
         if !drawn {
-            window.window().request_redraw();
+            window.winit_window().request_redraw();
         }
     }
 }
diff --git a/crates/fj-viewer/src/window.rs b/crates/fj-viewer/src/window.rs
index 3b1575395..e27212457 100644
--- a/crates/fj-viewer/src/window.rs
+++ b/crates/fj-viewer/src/window.rs
@@ -57,7 +57,7 @@ impl Window {
         })
     }
 
-    pub fn window(&self) -> &winit::window::Window {
+    pub fn winit_window(&self) -> &winit::window::Window {
         &self.window
     }