diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 20126bb89e..ae3c10495f 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -1452,6 +1452,10 @@ impl Editor {
     }
 
     pub fn cancel(&mut self, _: &Cancel, cx: &mut ViewContext<Self>) {
+        if self.take_rename(cx).is_some() {
+            return;
+        }
+
         if self.hide_context_menu(cx).is_some() {
             return;
         }