diff --git a/git/libgit.v b/git/libgit.v
index 69549eb1..1ef18037 100644
--- a/git/libgit.v
+++ b/git/libgit.v
@@ -89,6 +89,10 @@ fn C.git_blob_free(&C.git_blob)
 fn C.git_clone(&&C.git_repository, &char, &char, &C.git_clone_options) int
 fn C.git_clone_options_init(&C.git_clone_options, int)
 
+fn C.git_object_lookup_bypath(&&C.git_object, &C.git_object, &char, int) int
+fn C.git_object_peel(&&C.git_object, &C.git_object, int) int
+fn C.git_object_id(&C.git_object) &C.git_oid
+
 fn init() {
 	C.git_libgit2_init()
 }
@@ -242,36 +246,34 @@ pub fn (r &Repo) show_file_blob(branch string, file_path string) !string {
 		C.printf(c'Failed to get commit tree\n')
 		return error('sdf')
 	}
+	// create file object
+	mut file_obj := &C.git_object(unsafe { nil })
 
-	tree := unsafe { &C.git_tree(treeish) }
-
-	// Iterate through the tree entries to find the file
-	entry_count := C.git_tree_entrycount(tree)
-	// println('number of entires ${entry_count}')
-	for i := 0; i < entry_count; i++ {
-		entry := C.git_tree_entry_byindex(tree, i)
-		entry_name := C.git_tree_entry_name(entry)
-		C.printf(c'%s\n', entry_name)
-
-		if unsafe { C.strcmp(entry_name, file_path.str) } == 0 {
-			// Found the file
-			if C.git_blob_lookup(&blob, r.obj, C.git_tree_entry_id(entry)) != 0 {
-				C.printf(c'Failed to lookup blob: %s\n', C.git_error_last().message)
-				return error('sdf')
-			}
-
-			content := C.git_blob_rawcontent(blob)
-			// size := C.git_blob_rawsize(blob)
+	// get file object
+	if C.git_object_lookup_bypath(&file_obj, treeish, file_path.str, C.GIT_OBJECT_BLOB) != 0 {
+		C.printf(c'Failed to lookup file: %s\n', C.git_error_last().message)
+		return error('sdf')
+	}
 
-			C.printf(c'Content of %s (from branch %s):\n', file_path.str, branch.str)
-			// C.fwrite(content, 1, size, C.stdout)
+	// get file oid
+	mut oid := C.git_object_id(file_obj)
 
-			text := unsafe { cstring_to_vstring(content) }
-			C.git_blob_free(blob)
-			return text
-		}
+	// get blob object
+	if C.git_blob_lookup(&blob, r.obj, oid) != 0 {
+		C.printf(c'Failed to lookup blob: %s\n', C.git_error_last().message)
+		return error('sdf')
 	}
-	return ''
+
+	// get blob content
+	content := C.git_blob_rawcontent(blob)
+	// size := C.git_blob_rawsize(blob)
+
+	C.printf(c'Content of %s (from branch %s):\n', file_path.str, branch.str)
+
+	text := unsafe { cstring_to_vstring(content) }
+	C.git_blob_free(blob)
+	return text
+
 }
 
 pub fn clone(url string, path string) {
diff --git a/tests/first_run.v b/tests/first_run.v
index 833fada5..2b5df3e4 100644
--- a/tests/first_run.v
+++ b/tests/first_run.v
@@ -61,6 +61,9 @@ fn main() {
 	test_commits_page(test_username, repo_name, test_github_repo_primary_branch)
 	test_branches_page(test_username, repo_name)
 	test_repo_tree(test_username, repo_name, test_github_repo_primary_branch, 'c')
+	// this makes sure that the blob (and the tree?) is ready
+	test_repo_tree(test_username, repo_name, test_github_repo_primary_branch, 'examples')
+	test_blob_page(test_username, repo_name, test_github_repo_primary_branch, 'examples/hello.v')
 	// test_refs_page(test_username, repo_name)
 	// test_api_branches_count(test_username, repo_name)
 	ilog("all tests passed!")
@@ -300,6 +303,18 @@ fn test_settings_page(username string) {
 	assert settings_page_result.status_code == 200
 }
 
+fn test_blob_page(username string, repo_name string, branch_name string, path string) {
+	url := "${username}/${repo_name}/blob/${branch_name}/${path}"
+	ilog('Testing the new blob /${url} page is up')
+	blob_page_result := http.fetch(
+		method:  .get
+		url:     prepare_url(url)
+	) or { exit_with_message(err.str()) }
+
+	assert blob_page_result.status_code == 200
+	assert blob_page_result.body.str().contains('m := r.match_str')
+}
+
 fn test_repo_settings_page(username string, repo_name string) {
 	test_endpoint_page("${username}/${repo_name}/settings", 'settings')
 }