diff --git a/ui-blob.c b/ui-blob.c
index 11589db..ab44659 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -36,7 +36,7 @@ void cgit_print_blob(const char *hex, char *path)
 	}
 
 	buf[size] = '\0';
-	ctx.page.mimetype = "text/plain";
+	ctx.page.mimetype = NULL;
 	ctx.page.filename = path;
 	cgit_print_http_headers(&ctx);
 	write(htmlfd, buf, size);
diff --git a/ui-tree.c b/ui-tree.c
index 9be3140..2f052c7 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -36,7 +36,8 @@ static void print_object(const unsigned char *sha1, char *path)
 	}
 
 	html(" blob: <a href='");
-	html_attr(cgit_pageurl(ctx.qry.repo, "blob", fmt("id=%s", sha1_to_hex(sha1))));
+	html_attr(cgit_pageurl(ctx.qry.repo, "blob",
+			       fmt("id=%s&path=%s", sha1_to_hex(sha1), path)));
 	htmlf("'>%s</a>",sha1_to_hex(sha1));
 
 	html("<table summary='blob content' class='blob'>\n");