diff --git a/src/skills-builder/skills-builder-modal/select-preferences/GoalSelect.jsx b/src/skills-builder/skills-builder-modal/select-preferences/GoalSelect.jsx
index 8e423f0..1eccfd1 100644
--- a/src/skills-builder/skills-builder-modal/select-preferences/GoalSelect.jsx
+++ b/src/skills-builder/skills-builder-modal/select-preferences/GoalSelect.jsx
@@ -42,7 +42,7 @@ const GoalDropdown = () => {
         onChange={handleGoalSelect}
         data-testid="goal-select-dropdown"
       >
-        <option value="">{formatMessage(messages.selectLearningGoal)}</option>
+        <option value="" disabled={currentGoal}>{formatMessage(messages.selectLearningGoal)}</option>
         <option>{formatMessage(messages.learningGoalStartCareer)}</option>
         <option>{formatMessage(messages.learningGoalAdvanceCareer)}</option>
         <option>{formatMessage(messages.learningGoalChangeCareer)}</option>
diff --git a/src/skills-builder/skills-builder-modal/select-preferences/SelectPreferences.jsx b/src/skills-builder/skills-builder-modal/select-preferences/SelectPreferences.jsx
index 90f65a5..bf8c02c 100644
--- a/src/skills-builder/skills-builder-modal/select-preferences/SelectPreferences.jsx
+++ b/src/skills-builder/skills-builder-modal/select-preferences/SelectPreferences.jsx
@@ -27,7 +27,7 @@ const SelectPreferences = () => {
           <JobTitleSelect />
         )}
 
-        {currentJobTitle && (
+        {currentGoal && currentJobTitle && (
           <CareerInterestSelect />
         )}
       </Stack>