diff --git a/app/decorators/tree_decorator.rb b/app/decorators/tree_decorator.rb
index 5a7b13ab..eb3859a9 100644
--- a/app/decorators/tree_decorator.rb
+++ b/app/decorators/tree_decorator.rb
@@ -28,4 +28,8 @@ class TreeDecorator < ApplicationDecorator
     file = File.join(path, "..")
     h.project_tree_path(project, h.tree_join(ref, file))
   end
+
+  def readme
+    @readme ||= contents.find { |c| c.is_a?(Grit::Blob) and c.name =~ /^readme/i }
+  end
 end
diff --git a/app/views/tree/_tree.html.haml b/app/views/tree/_tree.html.haml
index 71192109..02ae3d90 100644
--- a/app/views/tree/_tree.html.haml
+++ b/app/views/tree/_tree.html.haml
@@ -32,8 +32,8 @@
 
       = render_tree(tree.contents)
 
-    - if readme = tree.contents.find { |c| c.is_a?(Grit::Blob) and c.name =~ /^readme/i }
-      = render "tree/readme", readme: readme
+    - if tree.readme
+      = render "tree/readme", readme: tree.readme
 
 - unless tree.is_blob?
   :javascript