diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 4ac114331d..f30e5264f1 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -1243,7 +1243,7 @@ impl Context for AppContext {
                 .get_mut(handle.id)
                 .ok_or_else(|| anyhow!("window not found"))?
                 .take()
-                .unwrap();
+                .ok_or_else(|| anyhow!("window not found"))?;
 
             let root_view = window.root_view.clone().unwrap();
             let result = update(root_view, &mut WindowContext::new(cx, &mut window));