diff --git a/src/components/file-picker.tsx b/src/components/file-picker.tsx
index 64480374..957ee654 100644
--- a/src/components/file-picker.tsx
+++ b/src/components/file-picker.tsx
@@ -123,8 +123,9 @@ const FilePicker: Component<FilePickerProps> = (props) => {
     if (props.open && !isInitialized()) {
       setIsInitialized(true)
       console.log("[FilePicker] First open - fetching git files and initial files")
-      fetchGitFiles()
-      fetchFiles(props.searchQuery)
+      fetchGitFiles().then(() => {
+        fetchFiles(props.searchQuery)
+      })
       lastQuery = props.searchQuery
       return
     }