diff --git a/files/templates/comments.html b/files/templates/comments.html
index ee6d3f80f8..1f1aa7f6bc 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -108,7 +108,7 @@
 	{% set isreply = False %}
 {% endif %}
 
-<div id="comment-{{c.id}}" class="anchor comment {% if wall and level == 1 %}mt-5{% elif wall %}mt-4{% elif standalone and level==1 %}mt-0{% endif %} {% if collapse or c.collapse_for_user(v, comment_info, request.full_path) %}collapsed{% endif %}" style="{% if isreply %}padding-left:0!important{% endif %}">
+<div id="comment-{{c.id}}" class="anchor comment {% if wall and level == 1 and not (comment_info and c == comment_info) %}mt-5{% elif wall %}mt-4{% elif standalone and level==1 %}mt-0{% endif %} {% if collapse or c.collapse_for_user(v, comment_info, request.full_path) %}collapsed{% endif %}" style="{% if isreply %}padding-left:0!important{% endif %}">
 	{% if not isreply %}
 		<span class="comment-collapse-desktop" style="border-color: {% if c.ghost %}var(--primary){% else %}#{{c.author.name_color}}{% endif %}" data-nonce="{{g.nonce}}" data-onclick="collapse_comment('{{c.id}}')"></span>
 	{% endif %}
diff --git a/files/templates/userpage/wall.html b/files/templates/userpage/wall.html
index 7f10c372e4..7fea31b7ec 100644
--- a/files/templates/userpage/wall.html
+++ b/files/templates/userpage/wall.html
@@ -2,7 +2,12 @@
 {% block userpage_content %}
 <div class="userpage-wall">
 	{{macros.comment_reply_box(u.fullname, 'replying-to-' + u.fullname, '', 'mb-3 mt-4', '', enable_cancel_button=false)}}
-	<div class="row no-gutters {% if listing %}mt-md-3{% elif not listing %}my-md-3{% endif %} px-3 p-md-0 userpage-wall" style="margin-top: 10px;">
+
+	{% if comment_info %}
+		<div class="total mt-1"><a href="/@{{u.username}}">View entire wall <i class="fas fa-long-arrow-right ml-1"></i></a></div>
+	{% endif %}
+
+	<div class="row no-gutters px-3 p-md-0 userpage-wall" style="margin-top: 10px;">
 		<div class="col">
 			<div class="comment-section" id="replies-of-{{u.fullname}}">
 				{% with comments=listing %}