diff --git a/files/templates/submission.html b/files/templates/submission.html
index d32b0d0d9..3c8a1ff02 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -337,9 +337,6 @@
 					{% if sort != "old" %}<a class="dropdown-item" href="?sort=old"><i class="fas fa-book mr-2"></i>Old</a>{% endif %}
 					{% if sort != "controversial" %}<a class="dropdown-item" href="?sort=controversial"><i class="fas fa-bullhorn mr-2"></i>Controversial</a>{% endif %}
 				</div>
-				{% if comment_info and p.comment_count >= 2%}
-					<div class="total mt-1"><a href="{{p.permalink}}">View entire discussion</a></div>
-				{% endif %}
 			</div>
 		</div>
 
@@ -389,6 +386,10 @@
 		{% endif %}
 	{% endif %}
 
+{% if comment_info %}
+	<div class="total mt-1"><a href="{{p.permalink}}">View entire discussion</a></div>
+{% endif %}
+
 {% if p.replies %}
 	<div class="comment-section" id="replies-of-{{p.fullname}}">
 		{% with comments=p.replies %}
diff --git a/files/templates/userpage/wall.html b/files/templates/userpage/wall.html
index 1053cf956..b3e9de048 100644
--- a/files/templates/userpage/wall.html
+++ b/files/templates/userpage/wall.html
@@ -75,6 +75,10 @@
 	</div>
 {% endif %}
 
+{% if comment_info %}
+	<div class="total mt-2"><a href="/@{{u.username}}">View entire discussion</a></div>
+{% endif %}
+
 <div class="row no-gutters {% if listing %}mt-md-3{% elif not listing %}my-md-3{% endif %} px-3 p-md-0" style="margin-top: 10px;">
 
 	<div class="col">