diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index d25a035a66e..4f0fcddacdc 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -186,6 +186,19 @@
{{#conditional-loading-spinner condition=model.postStream.loadingFilter}}
{{#if loadedAllPosts}}
+ {{#if model.pending_posts_count}}
+
+ {{{i18n "queue.has_pending_posts" count=model.pending_posts_count}}}
+
+ {{#if currentUser.show_queued_posts}}
+ {{#link-to "queued-posts"}}
+ {{d-icon "check"}}
+ {{i18n "queue.view_pending"}}
+ {{/link-to}}
+ {{/if}}
+
+ {{/if}}
+
{{topic-timer-info
statusType=model.topic_timer.status_type
executeAt=model.topic_timer.execute_at
@@ -224,19 +237,6 @@
{{/if}}
{{/if}}
- {{#if model.pending_posts_count}}
-
- {{{i18n "queue.has_pending_posts" count=model.pending_posts_count}}}
-
- {{#if currentUser.show_queued_posts}}
- {{#link-to "queued-posts"}}
- {{d-icon "check"}}
- {{i18n "queue.view_pending"}}
- {{/link-to}}
- {{/if}}
-
- {{/if}}
-
{{#if showSelectedPostsAtBottom}}
{{partial "selected-posts"}}
diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss
index f4050b46a62..ed3784cf54a 100644
--- a/app/assets/stylesheets/common/base/topic.scss
+++ b/app/assets/stylesheets/common/base/topic.scss
@@ -95,6 +95,8 @@
a[href] {
float: right;
}
+ margin-top: 1em;
+ max-width: 757px;
}
// Target the .badge-category text, the bullet icon needs to maintain `display: block`