diff --git a/app/templates/macros/threads.html b/app/templates/macros/threads.html
index a419e9d5..710e7faa 100644
--- a/app/templates/macros/threads.html
+++ b/app/templates/macros/threads.html
@@ -121,7 +121,19 @@
 	</p>
 {% endif %}
 
-{% if current_user.is_authenticated %}
+{% if form == False %}
+	<div class="row mt-1">
+		<div class="col-md-1 p-1"></div>
+		<div class="col">
+			<a class="btn btn-primary ml-3" href="{{ url_for('threads.view', id=thread.id) }}">
+				<i class="fas fa-reply mr-1"></i>
+				{{ _("Reply") }}
+			</a>
+		</div>
+	</div>
+{% endif %}
+
+{% if current_user.is_authenticated and form != False %}
 <div class="row mt-0 mb-4 comments mx-0">
 	<div class="col-md-1 p-1">
 		<img class="img-fluid user-photo img-thumbnail img-thumbnail-1"
@@ -150,7 +162,7 @@
 				</div>
 			{% elif form %}
 				{% from "macros/forms.html" import render_field, render_submit_field %}
-				<form method="post" action="{{ url_for('threads.view', id=thread.id)}}" class="card-body">
+				<form method="post" action="{{ url_for('threads.view', id=thread.id) }}" class="card-body">
 					{{ form.hidden_tag() }}
 					{{ render_field(form.comment, fieldclass="form-control markdown", label="") }}
 					{{ render_submit_field(form.submit) }}
diff --git a/app/templates/packages/view.html b/app/templates/packages/view.html
index 0a199b37..a1d7aa11 100644
--- a/app/templates/packages/view.html
+++ b/app/templates/packages/view.html
@@ -84,6 +84,27 @@
 		{% set package_warning=_("Non-free media") %}
 	{% endif %}
 <main>
+	{% if not package.approved %}
+		<section class="my-4 pb-3" style="">
+			<div class="container">
+				{% from "macros/package_approval.html" import render_banners %}
+				{{ render_banners(package, current_user, topic_error, topic_error_lvl, conflicting_modnames) }}
+
+				{% if review_thread and review_thread.checkPerm(current_user, "SEE_THREAD") %}
+					<h2>{% if review_thread.private %}&#x1f512;{% endif %} {{ review_thread.title }}</h2>
+					{% if review_thread.private %}
+						<p><i>
+							{{ _("This thread is only visible to its creator, package maintainers, users of Approver rank or above, and @mentioned users.") }}
+						</i></p>
+					{% endif %}
+
+					{% from "macros/threads.html" import render_thread %}
+					{{ render_thread(review_thread, current_user, form=False) }}
+				{% endif %}
+			</div>
+		</section>
+	{% endif %}
+
 	{% set cover_image = package.getCoverImageURL() %}
 	<header class="jumbotron pb-3"
 			style="background: linear-gradient(rgba(0, 0, 0, 0.4), rgba(0, 0, 0, 0.7)), url('{{ cover_image }}');
@@ -215,27 +236,6 @@
 		</div>
 	</header>
 
-	{% if not package.approved %}
-		<section class="my-4 pb-3" style="border-bottom: 1px solid rgba(0,0,0,0.5);">
-			<div class="container">
-				{% from "macros/package_approval.html" import render_banners %}
-				{{ render_banners(package, current_user, topic_error, topic_error_lvl, conflicting_modnames) }}
-
-				{% if review_thread and review_thread.checkPerm(current_user, "SEE_THREAD") %}
-					<h2>{% if review_thread.private %}&#x1f512;{% endif %} {{ review_thread.title }}</h2>
-					{% if review_thread.private %}
-						<p><i>
-							{{ _("This thread is only visible to its creator, package maintainers, users of Approver rank or above, and @mentioned users.") }}
-						</i></p>
-					{% endif %}
-
-					{% from "macros/threads.html" import render_thread %}
-					{{ render_thread(review_thread, current_user) }}
-				{% endif %}
-			</div>
-		</section>
-	{% endif %}
-
 	<div class="container d-block d-md-none">
 		{{ self.download_btn() }}
 	</div>