diff --git a/crates/editor/src/code_context_menus.rs b/crates/editor/src/code_context_menus.rs
index 7ea3e0be076527bca1e021e7298d9af9c76b25d0..26b2fdf8bab02fc4fe35a71db202004843b5ce80 100644
--- a/crates/editor/src/code_context_menus.rs
+++ b/crates/editor/src/code_context_menus.rs
@@ -325,7 +325,9 @@ impl CompletionsMenu {
             }
         }
         .into();
-        self.selected_item = 0;
+        if self.selected_item != 0 && self.selected_item + 1 < self.entries.len() {
+            self.selected_item += 1;
+        }
     }
 
     pub fn resolve_selected_completion(