diff --git a/EditSet.tsx b/EditSet.tsx
index 83d4310..a2940c5 100644
--- a/EditSet.tsx
+++ b/EditSet.tsx
@@ -78,7 +78,7 @@ export default function EditSet() {
 
   return (
     <View style={{padding: 10}}>
-      <SetForm save={save} set={params.set} next={params.next} />
+      <SetForm save={save} set={params.set} workouts={params.workouts} />
     </View>
   );
 }
diff --git a/HomePage.tsx b/HomePage.tsx
index b0acf86..7198fa7 100644
--- a/HomePage.tsx
+++ b/HomePage.tsx
@@ -13,7 +13,7 @@ export type HomePageParams = {
   Sets: {};
   EditSet: {
     set: Set;
-    next?: string;
+    workouts?: string[];
   };
 };
 
diff --git a/SetForm.tsx b/SetForm.tsx
index f7bf32f..9afbe19 100644
--- a/SetForm.tsx
+++ b/SetForm.tsx
@@ -6,11 +6,11 @@ import Set from './set';
 export default function SetForm({
   save,
   set,
-  next,
+  workouts,
 }: {
   set: Set;
   save: (set: Set) => void;
-  next?: string;
+  workouts?: string[];
 }) {
   const [name, setName] = useState(set.name);
   const [reps, setReps] = useState(set.reps.toString());
@@ -81,10 +81,19 @@ export default function SetForm({
         />
         {set.created && (
           <Text style={{marginBottom: 10}}>
-            Created: {set.created?.replace('T', ' ')}
+            {set.created.replace('T', ' ')}
           </Text>
         )}
-        {next && <Text>Next: {next}</Text>}
+        <Text>
+          {workouts?.map((workout, index) => (
+            <Text
+              key={workout}
+              style={{fontWeight: workout === name ? 'bold' : 'normal'}}>
+              {workout}
+              {index === workouts.length - 1 ? '.' : ', '}
+            </Text>
+          ))}
+        </Text>
       </ScrollView>
       <Button
         disabled={!name}
diff --git a/SetList.tsx b/SetList.tsx
index 72c6814..404887f 100644
--- a/SetList.tsx
+++ b/SetList.tsx
@@ -27,7 +27,7 @@ const defaultSet = {
 export default function SetList() {
   const [sets, setSets] = useState<Set[]>();
   const [set, setSet] = useState<Set>();
-  const [nextWorkout, setNextWorkout] = useState<string>();
+  const [workouts, setWorkouts] = useState<string[]>([]);
   const [offset, setOffset] = useState(0);
   const [search, setSearch] = useState('');
   const [refreshing, setRefreshing] = useState(false);
@@ -125,7 +125,7 @@ export default function SetList() {
     }
     const best = await getBest(workout);
     setSet({...best});
-    setNextWorkout(todaysWorkouts[todaysWorkouts.indexOf(workout) + 1]);
+    setWorkouts(todaysWorkouts);
   }, [getTodaysSets, getTodaysPlan, getBest, db]);
 
   useFocusEffect(
@@ -171,9 +171,9 @@ export default function SetList() {
   const onAdd = useCallback(async () => {
     navigation.navigate('EditSet', {
       set: set || {...defaultSet},
-      next: nextWorkout,
+      workouts,
     });
-  }, [navigation, set, nextWorkout]);
+  }, [navigation, set, workouts]);
 
   return (
     <View style={styles.container}>