diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index f6d62a3c83babc2111c14f4cfa13745973482cc4..b601044e55b5b4493749f4b8f8211ab6f0ee8f10 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -5596,9 +5596,9 @@ impl Editor {
                             .timer(Duration::from_millis(milliseconds))
                             .fuse();
                         pending_autosave.await;
-                        futures::select! {
-                            _ = timer => {}
+                        futures::select_biased! {
                             _ = cancel_rx => return None,
+                            _ = timer => {}
                         }
 
                         this.upgrade(&cx)?