diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index bc4f780e6a93f763487d8af71827410d289149aa..0da2031f8878c5f0d39751a0f9117d7ece837044 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -1591,6 +1591,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()