diff --git a/crates/vector_store/src/modal.rs b/crates/vector_store/src/modal.rs
index 8052277a0bf37b13fcc16d26e4081484cec05894..1ca59c558523ec94a7c7e4690ff6afd10b5204a9 100644
--- a/crates/vector_store/src/modal.rs
+++ b/crates/vector_store/src/modal.rs
@@ -1,15 +1,16 @@
-use std::sync::Arc;
-
+use crate::{SearchResult, VectorStore};
 use gpui::{
     actions, elements::*, AnyElement, AppContext, ModelHandle, MouseState, Task, ViewContext,
     WeakViewHandle,
 };
 use picker::{Picker, PickerDelegate, PickerEvent};
 use project::Project;
+use std::{sync::Arc, time::Duration};
 use util::ResultExt;
 use workspace::Workspace;
 
-use crate::{SearchResult, VectorStore};
+const MIN_QUERY_LEN: usize = 5;
+const EMBEDDING_DEBOUNCE_INTERVAL: Duration = Duration::from_millis(500);
 
 actions!(semantic_search, [Toggle]);
 
@@ -68,18 +69,26 @@ impl PickerDelegate for SemanticSearchDelegate {
     }
 
     fn update_matches(&mut self, query: String, cx: &mut ViewContext<SemanticSearch>) -> Task<()> {
-        let task = self.vector_store.update(cx, |store, cx| {
-            store.search(&self.project, query.to_string(), 10, cx)
-        });
+        if query.len() < MIN_QUERY_LEN {
+            return Task::ready(());
+        }
 
+        let vector_store = self.vector_store.clone();
+        let project = self.project.clone();
         cx.spawn(|this, mut cx| async move {
-            let results = task.await.log_err();
-            this.update(&mut cx, |this, cx| {
-                if let Some(results) = results {
+            cx.background().timer(EMBEDDING_DEBOUNCE_INTERVAL).await;
+
+            let task = vector_store.update(&mut cx, |store, cx| {
+                store.search(&project, query.to_string(), 10, cx)
+            });
+
+            if let Some(results) = task.await.log_err() {
+                this.update(&mut cx, |this, _| {
                     let delegate = this.delegate_mut();
                     delegate.matches = results;
-                }
-            });
+                })
+                .ok();
+            }
         })
     }
 
diff --git a/crates/vector_store/src/vector_store.rs b/crates/vector_store/src/vector_store.rs
index a66c2d65ba63bbad387b1a63b9d0057244578787..c37a50e4de8640914079be337a3d2ccc2ffa9563 100644
--- a/crates/vector_store/src/vector_store.rs
+++ b/crates/vector_store/src/vector_store.rs
@@ -31,14 +31,14 @@ pub fn init(
     language_registry: Arc<LanguageRegistry>,
     cx: &mut AppContext,
 ) {
-    let vector_store = cx.add_model(|cx| {
+    let vector_store = cx.add_model(|_| {
         VectorStore::new(
             fs,
             VECTOR_DB_URL.to_string(),
-            // Arc::new(OpenAIEmbeddings {
-            //     client: http_client,
-            // }),
-            Arc::new(DummyEmbeddings {}),
+            // Arc::new(DummyEmbeddings {}),
+            Arc::new(OpenAIEmbeddings {
+                client: http_client,
+            }),
             language_registry,
         )
     });
@@ -74,6 +74,7 @@ pub fn init(
             })
         }
     });
+
     SemanticSearch::init(cx);
 }