diff --git a/app/views/projects/wikis/_wiki_pages.html.haml b/app/views/projects/wikis/_wiki_pages.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..ac98599d96b41464c7ab50f32aa4ea69279094e8
--- /dev/null
+++ b/app/views/projects/wikis/_wiki_pages.html.haml
@@ -0,0 +1,6 @@
+- wiki_pages.each do |wiki_page|
+  %li
+    = link_to wiki_page.title, namespace_project_wiki_path(@project.namespace, @project, wiki_page)
+    %small (#{wiki_page.format})
+    .pull-right
+      %small Last edited #{time_ago_with_tooltip(wiki_page.commit.authored_date)}
diff --git a/app/views/projects/wikis/pages.html.haml b/app/views/projects/wikis/pages.html.haml
index 274afb1bdea9002d38d35efaca921d8d75cd02c2..2813b3a1c81d740b665112ce9ff661f866fd2ee0 100644
--- a/app/views/projects/wikis/pages.html.haml
+++ b/app/views/projects/wikis/pages.html.haml
@@ -15,13 +15,12 @@
 
   %ul.content-list
     - @wiki_directories.each do |wiki_directory, wiki_pages|
-      %li
-        = wiki_directory
-        %ul
-        - wiki_pages.each do |wiki_page|
-          %li
-            = link_to wiki_page.title, namespace_project_wiki_path(@project.namespace, @project, wiki_page)
-            %small (#{wiki_page.format})
-            .pull-right
-              %small Last edited #{time_ago_with_tooltip(wiki_page.commit.authored_date)}
+      - if wiki_directory == '/'
+        = render 'wiki_pages', wiki_pages: wiki_pages
+      - else
+        %li
+          = wiki_directory
+          %ul
+            = render 'wiki_pages', wiki_pages: wiki_pages
+
   = paginate @wiki_pages, theme: 'gitlab'