diff --git a/src/renderer/src/components/sidebar/AddRepoCreateStep.tsx b/src/renderer/src/components/sidebar/AddRepoCreateStep.tsx
index aefa859bbf6..9c994fe5e4c 100644
--- a/src/renderer/src/components/sidebar/AddRepoCreateStep.tsx
+++ b/src/renderer/src/components/sidebar/AddRepoCreateStep.tsx
@@ -55,8 +55,9 @@ export function useCreateRepo(
       toast.error('Enter a server parent path.')
       return
     }
+    const gen = createGenRef.current
     const dir = await window.api.repos.pickDirectory()
-    if (dir) {
+    if (dir && gen === createGenRef.current) {
       setCreateParent(dir)
       setCreateError(null)
     }