diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml
index affe01a7ef94fba499d04eedd928adc65e35ff9d..539c57651f740e8e7da690377508394ce39c05af 100644
--- a/app/views/dashboard/issues.html.haml
+++ b/app/views/dashboard/issues.html.haml
@@ -17,7 +17,7 @@
             = link_to_project project
           %ul.well-list.issues_table
             - group[1].each do |issue|
-              = render(partial: 'issues/show', locals: {issue: issue})
+              = render issue
       %hr
       = paginate @issues, theme: "gitlab"
     - else
diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml
index 94682bdd51e035611cef5b90fbcd72d70d8b00c6..96aa2a1626d5a7311fe2e8c89cefb9858a778559 100644
--- a/app/views/groups/issues.html.haml
+++ b/app/views/groups/issues.html.haml
@@ -16,7 +16,7 @@
             = link_to_project project
           %ul.well-list.issues_table
             - group[1].each do |issue|
-              = render(partial: 'issues/show', locals: {issue: issue})
+              = render issue
       %hr
       = paginate @issues, theme: "gitlab"
     - else
diff --git a/app/views/issues/_show.html.haml b/app/views/issues/_issue.html.haml
similarity index 100%
rename from app/views/issues/_show.html.haml
rename to app/views/issues/_issue.html.haml
diff --git a/app/views/issues/_issues.html.haml b/app/views/issues/_issues.html.haml
index 3bbd293dba2897aa41e93f739d0a89b9624fc730..dc7db9061ac23dcadb27ef732981a5abc3e8cf71 100644
--- a/app/views/issues/_issues.html.haml
+++ b/app/views/issues/_issues.html.haml
@@ -1,5 +1,4 @@
-- @issues.each do |issue|
-  = render(partial: 'issues/show', locals: {issue: issue})
+= render @issues
 
 - if @issues.present?
   %li.bottom
diff --git a/app/views/teams/issues.html.haml b/app/views/teams/issues.html.haml
index c6a68c37b9c9edeca02b441ae1019cf819030e47..5b17c5d4f0b79c474a6a4d5da33563d60536d2d7 100644
--- a/app/views/teams/issues.html.haml
+++ b/app/views/teams/issues.html.haml
@@ -16,7 +16,7 @@
             = link_to_project @project
           %ul.well-list.issues_table
             - group[1].each do |issue|
-              = render(partial: 'issues/show', locals: {issue: issue})
+              = render issue
       %hr
       = paginate @issues, theme: "gitlab"
     - else