diff --git a/components/JobDropdown/index.tsx b/components/JobDropdown/index.tsx
index 3b1d468c..9a4cd18c 100644
--- a/components/JobDropdown/index.tsx
+++ b/components/JobDropdown/index.tsx
@@ -102,7 +102,7 @@ const JobDropdown = React.forwardRef<HTMLSelectElement, Props>(
 
     return (
       <Select
-        trigger={'Select a class...'}
+        defaultValue={props.currentJob}
         placeholder={'Select a class...'}
         open={open}
         onClick={openJobSelect}
@@ -113,7 +113,9 @@ const JobDropdown = React.forwardRef<HTMLSelectElement, Props>(
           No class
         </SelectItem>
         {sortedJobs
-          ? Object.keys(sortedJobs).map((x) => renderJobGroup(x))
+          ? Object.keys(sortedJobs)
+              .sort((a, b) => ('' + a).localeCompare(b))
+              .map((x) => renderJobGroup(x))
           : ''}
       </Select>
     )