diff --git a/resources/scripts/components/server/schedules/ScheduleEditContainer.tsx b/resources/scripts/components/server/schedules/ScheduleEditContainer.tsx
index d7c5f2abf..2c512fd33 100644
--- a/resources/scripts/components/server/schedules/ScheduleEditContainer.tsx
+++ b/resources/scripts/components/server/schedules/ScheduleEditContainer.tsx
@@ -108,9 +108,21 @@ export default ({ match, history, location: { state } }: RouteComponentProps<Par
                                         <ActivePill active={schedule.isActive}/>
                                     }
                                 </h3>
-                                <p css={tw`mt-1 text-sm text-neutral-300`}>
+                                <p css={tw`mt-1 text-sm text-neutral-200`}>
                                     Last run at:&nbsp;
-                                    {schedule.lastRunAt ? format(schedule.lastRunAt, 'MMM do \'at\' h:mma') : 'never'}
+                                    {schedule.lastRunAt ?
+                                        format(schedule.lastRunAt, 'MMM do \'at\' h:mma')
+                                        :
+                                        <span css={tw`text-neutral-300`}>n/a</span>
+                                    }
+                                    <span css={tw`ml-4 pl-4 border-l-4 border-neutral-600 py-px`}>
+                                        Next run at:&nbsp;
+                                        {schedule.nextRunAt ?
+                                            format(schedule.nextRunAt, 'MMM do \'at\' h:mma')
+                                            :
+                                            <span css={tw`text-neutral-300`}>n/a</span>
+                                        }
+                                    </span>
                                 </p>
                             </div>
                             <div css={tw`flex sm:block mt-3 sm:mt-0`}>