diff --git a/progit/app.py b/progit/app.py
index 88f4b47..54de86b 100644
--- a/progit/app.py
+++ b/progit/app.py
@@ -148,8 +148,6 @@ def view_file(repo, identifier, filename):
     """ Displays the content of a file or a tree for the specified repo.
     """
 
-
-
     if repo not in os.listdir(APP.config['GIT_FOLDER']):
         flask.abort(404, 'Git not found')
     repo_obj = pygit2.Repository(
@@ -239,3 +237,39 @@ def view_commit(repo, commitid):
         diff=diff,
         html_diff=html_diff,
     )
+
+
+@APP.route('/<repo>/tree/')
+@APP.route('/<repo>/tree/<identifier>')
+def view_tree(repo, identifier=None):
+    """ Render the tree of the repo
+    """
+    if repo not in os.listdir(APP.config['GIT_FOLDER']):
+        flask.abort(404)
+    repo_obj = pygit2.Repository(
+        os.path.join(APP.config['GIT_FOLDER'], repo))
+
+    if identifier in repo_obj.listall_branches():
+        branchname = identifier
+        branch = repo_obj.lookup_branch(identifier)
+        commit = branch.get_object()
+    else:
+        try:
+            commit = repo_obj.get(identifier)
+            branchname = identifier
+        except (ValueError, TypeError):
+            # If it's not a commit id then it's part of the filename
+            commit = repo_obj[repo_obj.head.target]
+            branchname = repo_obj.head.target
+
+    content=sorted(commit.tree, key=lambda x: x.filemode)
+    output_type = 'tree'
+
+    return flask.render_template(
+        'file.html',
+        repo=repo,
+        branchname=branchname,
+        filename='',
+        content=content,
+        output_type=output_type,
+    )
diff --git a/progit/templates/commit.html b/progit/templates/commit.html
index 081d95f..f15073b 100644
--- a/progit/templates/commit.html
+++ b/progit/templates/commit.html
@@ -10,6 +10,9 @@
   <a href="{{ url_for('view_repo', repo=repo)}}">
     {{ repo.split('.git')[0] }}
   </a>
+
+  (<a href="{{ url_for('view_tree', repo=repo, identifier=commitid) }}"
+    >tree</a>)
 </h2>
 
 <h3>Commit: {{ commitid }}</h3>
diff --git a/progit/templates/file.html b/progit/templates/file.html
index 44da93a..147ecd9 100644
--- a/progit/templates/file.html
+++ b/progit/templates/file.html
@@ -13,6 +13,7 @@
   : {{ branchname }}/{{filename}}
 </h2>
 
+<h3>Tree</h3>
 <section class="repos_list">
   {% if output_type=='file' %}
   {% autoescape false %}
@@ -22,13 +23,14 @@
   <ul>
     {% for entry in content %}
     <li>
+        {{ branchname }}
       {% if entry.filemode == 16384 %}
       [ ]
       {% endif %}
       <a href="{{ url_for('view_file',
                 repo=repo,
                 identifier=branchname,
-                filename=filename + '/' + entry.name) }}">
+                filename=filename + '/' + entry.name if filename else entry.name) }}">
         {{ entry.name }}
       </a>
       {{ entry.hex }}