diff --git a/packages/pl-fe/src/features/compose/components/compose-form.tsx b/packages/pl-fe/src/features/compose/components/compose-form.tsx
index 8335f7a4db..8bc10ec684 100644
--- a/packages/pl-fe/src/features/compose/components/compose-form.tsx
+++ b/packages/pl-fe/src/features/compose/components/compose-form.tsx
@@ -183,11 +183,12 @@ const ComposeForm = <ID extends string>({ id, shouldCondense, autoFocus, clickab
     </HStack>
   ), [features, id, anyMedia]);
 
-  const composeModifiers = !condensed && (
+  const showModifiers = !condensed && (compose.media_attachments.size || compose.is_uploading || compose.poll?.options.size || compose.schedule);
+
+  const composeModifiers = showModifiers && (
     <Stack space={4} className='font-[inherit] text-sm text-gray-900'>
       <UploadForm composeId={id} onSubmit={handleSubmit} />
       <PollForm composeId={id} />
-
       <ScheduleForm composeId={id} />
     </Stack>
   );
@@ -228,7 +229,7 @@ const ComposeForm = <ID extends string>({ id, shouldCondense, autoFocus, clickab
       {!shouldCondense && !event && !group && <ReplyMentions composeId={id} />}
 
       {!!selectButtons && (
-        <HStack space={2} wrap className='-mb-2'>
+        <HStack space={2} wrap className={clsx(transparent && '-mb-2')}>
           {selectButtons}
         </HStack>
       )}
diff --git a/packages/pl-fe/src/features/compose/components/upload-form.tsx b/packages/pl-fe/src/features/compose/components/upload-form.tsx
index 5cb19cacb6..d33ad510de 100644
--- a/packages/pl-fe/src/features/compose/components/upload-form.tsx
+++ b/packages/pl-fe/src/features/compose/components/upload-form.tsx
@@ -16,7 +16,9 @@ interface IUploadForm {
 const UploadForm: React.FC<IUploadForm> = ({ composeId, onSubmit }) => {
   const dispatch = useAppDispatch();
 
-  const mediaIds = useCompose(composeId).media_attachments.map((item) => item.id);
+  const { is_uploading: isUploading, media_attachments: mediaAttachments } = useCompose(composeId);
+
+  const mediaIds = mediaAttachments.map((item) => item.id);
 
   const dragItem = useRef<string | null>();
   const dragOverItem = useRef<string | null>();
@@ -35,11 +37,13 @@ const UploadForm: React.FC<IUploadForm> = ({ composeId, onSubmit }) => {
     dragOverItem.current = null;
   }, [dragItem, dragOverItem]);
 
+  if (!isUploading && mediaIds.isEmpty()) return null;
+
   return (
     <div className='overflow-hidden'>
       <UploadProgress composeId={composeId} />
 
-      <HStack wrap className={clsx('overflow-hidden', mediaIds.size !== 0 && 'p-1')}>
+      <HStack wrap className={clsx('overflow-hidden', mediaIds.size !== 0 && 'm-[-5px]')}>
         {mediaIds.map((id: string) => (
           <Upload
             id={id}