diff --git a/ui-refs.c b/ui-refs.c
index c35e694..25da00a 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -139,7 +139,7 @@ static int print_tag(struct refinfo *ref)
 		if (!header)
 			print_tag_header();
 		html("<tr><td>");
-		html_txt(name);
+		cgit_tag_link(name, NULL, NULL, ctx.qry.head, name);
 		html("</td><td>");
 		if (ctx.repo->snapshots && (ref->object->type == OBJ_COMMIT))
 			print_tag_downloads(ctx.repo, name);
diff --git a/ui-tag.c b/ui-tag.c
index 54b9f4c..0e056e0 100644
--- a/ui-tag.c
+++ b/ui-tag.c
@@ -75,6 +75,15 @@ void cgit_print_tag(char *revname)
 		html("</td></tr>\n");
 		html("</table>\n");
 		print_tag_content(info->msg);
-	}
+	} else {
+		html("<table class='commit-info'>\n");
+		htmlf("<tr><td>Tag name</td><td>");
+		html_txt(revname);
+		html("</td></tr>\n");
+		html("<tr><td>Tagged object</td><td>");
+		cgit_object_link(obj);
+		html("</td></tr>\n");
+		html("</table>\n");
+        }
 	return;
 }