diff --git a/crates/editor/src/code_context_menus.rs b/crates/editor/src/code_context_menus.rs
index 49a93a92ece6a59eab763d214a80536d486b5b03..d8d53e2b10771799900e65545c8c23306287b269 100644
--- a/crates/editor/src/code_context_menus.rs
+++ b/crates/editor/src/code_context_menus.rs
@@ -665,10 +665,11 @@ impl CompletionsMenu {
                 .collect()
         };
 
-        // Remove all candidates where the query's start does not match the start of any word in the candidate
+        let mut additional_matches = Vec::new();
+        // Deprioritize all candidates where the query's start does not match the start of any word in the candidate
         if let Some(query) = query {
             if let Some(query_start) = query.chars().next() {
-                matches.retain(|string_match| {
+                let (primary, secondary) = matches.into_iter().partition(|string_match| {
                     split_words(&string_match.string).any(|word| {
                         // Check that the first codepoint of the word as lowercase matches the first
                         // codepoint of the query as lowercase
@@ -678,6 +679,8 @@ impl CompletionsMenu {
                             .all(|(word_cp, query_cp)| word_cp == query_cp)
                     })
                 });
+                matches = primary;
+                additional_matches = secondary;
             }
         }
 
@@ -740,6 +743,8 @@ impl CompletionsMenu {
         }
         drop(completions);
 
+        matches.extend(additional_matches);
+
         *self.entries.borrow_mut() = matches;
         self.selected_item = 0;
         // This keeps the display consistent when y_flipped.
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 34db5b5ec1d040c9f94fbb585dde3ffc3a91e35e..1bf36f260a71393d5ed388048a2637d68688b391 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -9492,7 +9492,7 @@ async fn test_word_completions_continue_on_typing(cx: &mut TestAppContext) {
         }
     });
 
-    cx.simulate_keystroke("s");
+    cx.simulate_keystroke("l");
     cx.executor().run_until_parked();
     cx.condition(|editor, _| editor.context_menu_visible())
         .await;
@@ -9501,7 +9501,7 @@ async fn test_word_completions_continue_on_typing(cx: &mut TestAppContext) {
         {
             assert_eq!(
                 completion_menu_entries(&menu),
-                &["second"],
+                &["last"],
                 "After showing word completions, further editing should filter them and not query the LSP"
             );
         } else {