diff --git a/app/javascript/mastodon/components/status.jsx b/app/javascript/mastodon/components/status.jsx
index 39b6e8990..0f9d751eb 100644
--- a/app/javascript/mastodon/components/status.jsx
+++ b/app/javascript/mastodon/components/status.jsx
@@ -588,10 +588,10 @@ class Status extends ImmutablePureComponent {
                   {...statusContentProps}
                 />
 
-                {children}
-
                 {media}
                 {hashtagBar}
+
+                {children}
               </>
             )}
 
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.tsx b/app/javascript/mastodon/features/status/components/detailed_status.tsx
index 650e43934..ec6aa003e 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.tsx
+++ b/app/javascript/mastodon/features/status/components/detailed_status.tsx
@@ -377,12 +377,12 @@ export const DetailedStatus: React.FC<{
               {...(statusContentProps as any)}
             />
 
+            {media}
+            {hashtagBar}
+
             {status.get('quote') && (
               <QuotedStatus quote={status.get('quote')} />
             )}
-
-            {media}
-            {hashtagBar}
           </>
         )}