2 files changed, 11 insertions, 2 deletions

diff --git a/ui-refs.c b/ui-refs.c
index c35e694..25da00a 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -118,49 +118,49 @@ static int print_tag(struct refinfo *ref)
 
 	if (ref->object->type == OBJ_TAG) {
 		tag = (struct tag *)ref->object;
 		info = ref->tag;
 		if (!tag || !info)
 			return 1;
 		html("<tr><td>");
 		cgit_tag_link(name, NULL, NULL, ctx.qry.head, name);
 		html("</td><td>");
 		if (ctx.repo->snapshots && (tag->tagged->type == OBJ_COMMIT))
 			print_tag_downloads(ctx.repo, name);
 		else
 			cgit_object_link(tag->tagged);
 		html("</td><td>");
 		if (info->tagger)
 			html(info->tagger);
 		html("</td><td colspan='2'>");
 		if (info->tagger_date > 0)
 			cgit_print_age(info->tagger_date, -1, NULL);
 		html("</td></tr>\n");
 	} else {
 		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);
 		else
 			cgit_object_link(ref->object);
 		html("</td></tr>\n");
 	}
 	return 0;
 }
 
 static void print_refs_link(char *path)
 {
 	html("<tr class='nohover'><td colspan='4'>");
 	cgit_refs_link("[...]", NULL, NULL, ctx.qry.head, NULL, path);
 	html("</td></tr>");
 }
 
 void cgit_print_branches(int maxcount)
 {
 	struct reflist list;
 	int i;
 
 	html("<tr class='nohover'><th class='left'>Branch</th>"
 	     "<th class='left'>Commit message</th>"
diff --git a/ui-tag.c b/ui-tag.c
index 54b9f4c..0e056e0 100644
--- a/ui-tag.c
+++ b/ui-tag.c
@@ -54,27 +54,36 @@ void cgit_print_tag(char *revname)
 		}
 		html("<table class='commit-info'>\n");
 		htmlf("<tr><td>Tag name</td><td>");
 		html_txt(revname);
 		htmlf(" (%s)</td></tr>\n", sha1_to_hex(sha1));
 		if (info->tagger_date > 0) {
 			html("<tr><td>Tag date</td><td>");
 			cgit_print_date(info->tagger_date, FMT_LONGDATE, ctx.cfg.local_time);
 			html("</td></tr>\n");
 		}
 		if (info->tagger) {
 			html("<tr><td>Tagged by</td><td>");
 			html_txt(info->tagger);
 			if (info->tagger_email) {
 				html(" ");
 				html_txt(info->tagger_email);
 			}
 			html("</td></tr>\n");
 		}
 		html("<tr><td>Tagged object</td><td>");
 		cgit_object_link(tag->tagged);
 		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;
 }