diff --git a/app/javascript/mastodon/features/compose/components/compose_form.jsx b/app/javascript/mastodon/features/compose/components/compose_form.jsx
index f2beaed847..faecfa9b30 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/compose_form.jsx
@@ -316,8 +316,8 @@ class ComposeForm extends ImmutablePureComponent {
             className='compose-form__input'
           />
 
-          <UploadForm />
           <PollForm />
+          <UploadForm />
           <ComposeQuotedStatus />
 
           <div className='compose-form__footer'>