diff --git a/crates/assistant2/src/context_picker/file_context_picker.rs b/crates/assistant2/src/context_picker/file_context_picker.rs
index 572987f8af..65bbb4e302 100644
--- a/crates/assistant2/src/context_picker/file_context_picker.rs
+++ b/crates/assistant2/src/context_picker/file_context_picker.rs
@@ -282,7 +282,10 @@ pub fn render_file_context_entry(
     cx: &App,
 ) -> Stateful<Div> {
     let (file_name, directory) = if path == Path::new("") {
-        (SharedString::from(path_prefix.clone()), None)
+        (
+            SharedString::from(path_prefix.trim_end_matches('/').to_string()),
+            None,
+        )
     } else {
         let file_name = path
             .file_name()
@@ -291,8 +294,10 @@ pub fn render_file_context_entry(
             .to_string()
             .into();
 
-        let mut directory = format!("{}/", path_prefix);
-
+        let mut directory = path_prefix.to_string();
+        if !directory.ends_with('/') {
+            directory.push('/');
+        }
         if let Some(parent) = path.parent().filter(|parent| parent != &Path::new("")) {
             directory.push_str(&parent.to_string_lossy());
             directory.push('/');