diff --git a/app/javascript/mastodon/components/status.jsx b/app/javascript/mastodon/components/status.jsx
index 65fff3c7c16cb1..0f966b0e7044c1 100644
--- a/app/javascript/mastodon/components/status.jsx
+++ b/app/javascript/mastodon/components/status.jsx
@@ -669,12 +669,12 @@ class Status extends ImmutablePureComponent {
               {...statusContentProps}
             />
 
-            {(!status.get('spoiler_text') || expanded) && quote}
-
             {(!isCardMediaWithSensitive || !status.get('hidden')) && media}
 
             {(!status.get('spoiler_text') || expanded) && hashtagBar}
 
+            {(!status.get('spoiler_text') || expanded) && quote}
+
             {emojiReactionsBar}
 
             <StatusActionBar scrollKey={scrollKey} status={status} account={account} onFilter={matchedFilters ? this.handleFilterClick : null} {...other} />