diff --git a/files/assets/css/main.css b/files/assets/css/main.css
index a63bf1dee1..d4bfcf7261 100644
--- a/files/assets/css/main.css
+++ b/files/assets/css/main.css
@@ -7673,3 +7673,7 @@ blink {
 .active-hole {
 	background-color: var(--primary) !important;
 }
+
+.vertical-align {
+	vertical-align: middle;
+}
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 2c2c5beb0b..6897553c1e 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -222,7 +222,8 @@
 							{% elif c.created_utc %}
 								<span id="timestamp-{{c.id}}" data-nonce="{{g.nonce}}" data-onmouseover="timestamp(this, '{{c.created_utc}}')" data-bs-toggle="tooltip" data-bs-placement="bottom" class="time-stamp d-inline-block">&nbsp;{{c.age_string}}</span>
 							{% endif %}
-							&nbsp;&nbsp;#{{c.id}}
+
+							<a class="vertical-align ml-1" href="{{c.permalink}}">#{{c.id}}</a>
 
 							<span class="{% if not c.edited_utc %}d-none{% endif %} font-italic" data-nonce="{{g.nonce}}" data-bs-toggle="tooltip" data-bs-placement="bottom" data-onmouseover="timestamp(this, '{{c.edited_utc}}')">
 								&nbsp; Edited <span id="comment-edited_string-{{c.id}}">{{c.edited_string}}</span>
diff --git a/files/templates/util/macros.html b/files/templates/util/macros.html
index b7ed4f028e..1375604c21 100644
--- a/files/templates/util/macros.html
+++ b/files/templates/util/macros.html
@@ -104,7 +104,8 @@
 		<span class="ml-2 d-inline-block">Edited <span data-bs-toggle="tooltip" data-bs-placement="bottom" id="edited_timestamp-{{p.id}}" data-nonce="{{g.nonce}}" data-onmouseover="timestamp(this, '{{p.edited_utc}}')">{{p.edited_string}}</span></span>
 	{% endif %}
 	<span class="ml-2 d-inline-block">{{p.views}} thread views</span>
-	&nbsp;&nbsp;#{{p.id}}
+
+	<a class="vertical-align ml-2" href="{{p.permalink}}">#{{p.id}}</a>
 
 	{% if p.ping_cost %}
 		<em class="ml-2">spent {{p.ping_cost}} currency on pings</em>