diff --git a/crates/fj-viewer/src/graphics/renderer.rs b/crates/fj-viewer/src/graphics/renderer.rs
index babc6a408..149bbcf85 100644
--- a/crates/fj-viewer/src/graphics/renderer.rs
+++ b/crates/fj-viewer/src/graphics/renderer.rs
@@ -45,7 +45,7 @@ impl Renderer {
     /// Returns a new `Renderer`.
     pub async fn new(
         screen: &impl Screen<Window = egui_winit::winit::window::Window>,
-        event_loop: &EventLoop<()>,
+        _: &EventLoop<()>,
     ) -> Result<Self, InitError> {
         let instance = wgpu::Instance::new(wgpu::Backends::PRIMARY);
 
@@ -99,7 +99,6 @@ impl Renderer {
         //       Don't ask me how I know.
         //
 
-        let egui_winit_state = egui_winit::State::new(event_loop);
         let egui_context = egui::Context::default();
 
         // This is sound, as `window` is an object to create a surface upon.
@@ -243,7 +242,6 @@ impl Renderer {
 
             egui: EguiState {
                 context: egui_context,
-                winit_state: egui_winit_state,
                 render_pass: egui_rpass,
                 options: Default::default(),
             },
diff --git a/crates/fj-viewer/src/gui.rs b/crates/fj-viewer/src/gui.rs
index 832080f9f..b0fb68d98 100644
--- a/crates/fj-viewer/src/gui.rs
+++ b/crates/fj-viewer/src/gui.rs
@@ -8,7 +8,6 @@ pub struct EguiOptionsState {
 }
 
 pub struct EguiState {
-    pub winit_state: egui_winit::State,
     pub context: egui::Context,
     pub render_pass: egui_wgpu::renderer::RenderPass,
     pub options: EguiOptionsState,
diff --git a/crates/fj-window/src/run.rs b/crates/fj-window/src/run.rs
index 5677135b3..2bf7fbbcc 100644
--- a/crates/fj-window/src/run.rs
+++ b/crates/fj-window/src/run.rs
@@ -43,6 +43,7 @@ pub fn run(
 
     let mut input_handler = input::Handler::default();
     let mut renderer = block_on(Renderer::new(&window, &event_loop))?;
+    let mut egui_winit_state = egui_winit::State::new(&event_loop);
 
     let mut draw_config = DrawConfig::default();
 
@@ -104,10 +105,7 @@ pub fn run(
             // The primary visible impact of this currently is that if you drag
             // a title bar that overlaps the model then both the model & window
             // get moved.
-            renderer
-                .egui
-                .winit_state
-                .on_event(&renderer.egui.context, window_event);
+            egui_winit_state.on_event(&renderer.egui.context, window_event);
         }
 
         // fj-window events
@@ -175,7 +173,7 @@ pub fn run(
                 }
 
                 let egui_input =
-                    renderer.egui.winit_state.take_egui_input(window.window());
+                    egui_winit_state.take_egui_input(window.window());
 
                 if let Err(err) = renderer.draw(
                     &camera,