diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 9cf5630d..c07f44dc 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3393,6 +3393,8 @@ fn command_mode(cx: &mut Context) {
         None
     });
 
+    // Calculate initial completion
+    prompt.recalculate_completion(cx.editor);
     cx.push_layer(Box::new(prompt));
 }
 
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index e9ff9d1a..e269c8ed 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -38,7 +38,7 @@ pub fn regex_prompt(
     let snapshot = doc.selection(view_id).clone();
     let offset_snapshot = view.offset;
 
-    Prompt::new(
+    let mut prompt = Prompt::new(
         prompt,
         history_register,
         completion_fn,
@@ -91,7 +91,10 @@ pub fn regex_prompt(
                 }
             }
         },
-    )
+    );
+    // Calculate initial completion
+    prompt.recalculate_completion(cx.editor);
+    prompt
 }
 
 pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> FilePicker<PathBuf> {