diff --git a/app/views/projects/tree/_readme.html.haml b/app/views/projects/tree/_readme.html.haml
index 9d0292059d..ec2701af0e 100644
--- a/app/views/projects/tree/_readme.html.haml
+++ b/app/views/projects/tree/_readme.html.haml
@@ -1,6 +1,7 @@
 %article.readme-holder#README
-  %h4.readme-file-title
-    %i.icon-file
-    = readme.name
+  = link_to '#README' do
+    %h4.readme-file-title
+      %i.icon-file
+      = readme.name
   .wiki
     = render_readme(readme)
diff --git a/features/steps/project/browse_files.rb b/features/steps/project/browse_files.rb
index bd395a0d26..dd3f063da7 100644
--- a/features/steps/project/browse_files.rb
+++ b/features/steps/project/browse_files.rb
@@ -77,7 +77,9 @@ class ProjectBrowseFiles < Spinach::FeatureSteps
   end
 
   step 'I click on readme file' do
-    click_link 'README.md'
+    within '.tree-table' do
+      click_link 'README.md'
+    end
   end
 
   step 'I see Browse file link' do
diff --git a/features/steps/project/markdown_render.rb b/features/steps/project/markdown_render.rb
index 1885649891..83572718f3 100644
--- a/features/steps/project/markdown_render.rb
+++ b/features/steps/project/markdown_render.rb
@@ -79,9 +79,17 @@ class Spinach::Features::ProjectMarkdownRender < Spinach::FeatureSteps
   end
 
   And 'I navigate to the doc/api/README' do
-    click_link "doc"
-    click_link "api"
-    click_link "README.md"
+    within '.tree-table' do
+      click_link "doc"
+    end
+
+    within '.tree-table' do
+      click_link "api"
+    end
+
+    within '.tree-table' do
+      click_link "README.md"
+    end
   end
 
   And 'I see correct file rendered' do