diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 22417ba005b3855ecfd5792862eb06140e0aef7c..bcb22d426766abb1742bd5cbb7a9a11f0851f17f 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -1582,6 +1582,10 @@ impl Editor {
     }
 
     pub fn edit_prediction_in_conflict(&self) -> bool {
+        if !self.show_edit_predictions_in_menu() {
+            return false;
+        }
+
         let showing_completions = self
             .context_menu
             .borrow()