1 files changed, 9 insertions, 3 deletions
diff --git a/app/helpers/routing/projects_helper.rb b/app/helpers/routing/projects_helper.rb
index 06de9022be4..1f00d283a30 100644
--- a/app/helpers/routing/projects_helper.rb
+++ b/app/helpers/routing/projects_helper.rb
@@ -43,10 +43,12 @@ module Routing
     end
 
     def work_item_url(entity, *args)
-      if entity.project.present?
-        project_work_items_url(entity.project, entity.iid, *args)
+      return group_work_item_url(entity.namespace, entity.iid, *args) unless entity.project.present?
+
+      if use_issue_path?(entity)
+        project_issue_url(entity.project, entity.iid, *args)
       else
-        group_work_item_url(entity.namespace, entity.iid, *args)
+        project_work_item_url(entity.project, entity.iid, *args)
       end
     end
 
@@ -97,6 +99,10 @@ module Routing
 
       issue.issue_type == 'task'
     end
+
+    def use_issue_path?(work_item)
+      work_item.issue_type == 'issue'
+    end
   end
 end