diff --git a/app/soapbox/features/compose/components/compose-form.tsx b/app/soapbox/features/compose/components/compose-form.tsx
index 321b30aa2..5940dd7dd 100644
--- a/app/soapbox/features/compose/components/compose-form.tsx
+++ b/app/soapbox/features/compose/components/compose-form.tsx
@@ -319,7 +319,6 @@ const ComposeForm = <ID extends string>({ id, shouldCondense, autoFocus, clickab
           <Stack space={4} className='compose-form__modifiers'>
             <UploadForm composeId={id} />
             <PollForm composeId={id} />
-            <ScheduleFormContainer composeId={id} />
 
             <SpoilerInput
               composeId={id}
@@ -328,6 +327,8 @@ const ComposeForm = <ID extends string>({ id, shouldCondense, autoFocus, clickab
               onSuggestionSelected={onSpoilerSuggestionSelected}
               ref={spoilerTextRef}
             />
+
+            <ScheduleFormContainer composeId={id} />
           </Stack>
         }
       </AutosuggestTextarea>
diff --git a/app/soapbox/features/compose/components/schedule-form.tsx b/app/soapbox/features/compose/components/schedule-form.tsx
index 4c293662f..769dc6a97 100644
--- a/app/soapbox/features/compose/components/schedule-form.tsx
+++ b/app/soapbox/features/compose/components/schedule-form.tsx
@@ -52,8 +52,8 @@ const ScheduleForm: React.FC<IScheduleForm> = ({ composeId }) => {
   }
 
   return (
-    <Stack className='mb-2' space={1}>
-      <Text theme='muted'>
+    <Stack space={2}>
+      <Text weight='medium'>
         <FormattedMessage id='datepicker.hint' defaultMessage='Scheduled to post at…' />
       </Text>
       <HStack space={2} alignItems='center'>