diff --git a/frontend/src/components/project/overview/ProjectSelector.tsx b/frontend/src/components/project/overview/ProjectSelector.tsx
index 698ee237..785dd163 100644
--- a/frontend/src/components/project/overview/ProjectSelector.tsx
+++ b/frontend/src/components/project/overview/ProjectSelector.tsx
@@ -77,6 +77,7 @@ function ProjectSelectorForm({
     sethelperTextRecentProjects("");
     setHelperTextProjectPath("");
     setValueSource("");
+    setSubmitDisabled(true);
     formReset();
     closeDialog();
   };
@@ -220,7 +221,6 @@ function ProjectSelectorForm({
               },
               onChange: () => {
                 setValueSource("recentProjectPath");
-                void form.handleSubmit();
               },
             }}
           >
@@ -228,6 +228,7 @@ function ProjectSelectorForm({
               <field.RecentProjectSelect
                 recentProjects={userData.recent_project_directories}
                 helperText={helperTextRecentProjects}
+                setSubmitDisabled={setSubmitDisabled}
               />
             )}
           </form.AppField>
@@ -295,9 +296,11 @@ function ProjectSelectorForm({
 function RecentProjectSelect({
   recentProjects,
   helperText,
+  setSubmitDisabled,
 }: {
   recentProjects: string[];
   helperText: string;
+  setSubmitDisabled: (disabled: boolean) => void;
 }) {
   const field = useFieldContext<string>();
   const disabledSelect = recentProjects.length === 0;
@@ -318,6 +321,7 @@ function RecentProjectSelect({
         value={disabledSelect ? [] : [field.state.value]}
         onChange={(e: ChangeEvent<HTMLSelectElement>) => {
           field.handleChange(e.target.value);
+          setSubmitDisabled(e.target.value.length === 0);
         }}
         onBlur={() => {
           field.handleBlur();