diff --git a/src/api/app/helpers/webui/kiwi/image_helper.rb b/src/api/app/helpers/webui/kiwi/image_helper.rb
index 749d9954988..ca2f16b0d44 100644
--- a/src/api/app/helpers/webui/kiwi/image_helper.rb
+++ b/src/api/app/helpers/webui/kiwi/image_helper.rb
@@ -3,10 +3,10 @@ module Webui::Kiwi::ImageHelper
 
   def kiwi_image_breadcrumb(kiwi_image, *args)
     @project = kiwi_image.package.try(:project)
+    @package = kiwi_image.package
     return unless @project
 
-    args.insert(0, link_to_if(params['action'] != 'show', 'Image',
-                              kiwi_image_path(id: kiwi_image)))
+    args.insert(0, link_to(@package, package_show_path(project: @project, package: @package)))
     project_bread_crumb( *args )
   end
 end
diff --git a/src/api/spec/cassettes/ImageTemplates/branching/branch_image_template.yml b/src/api/spec/cassettes/ImageTemplates/branching/branch_image_template.yml
index 0239817c964..4dcbf166a64 100644
--- a/src/api/spec/cassettes/ImageTemplates/branching/branch_image_template.yml
+++ b/src/api/spec/cassettes/ImageTemplates/branching/branch_image_template.yml
@@ -1870,4 +1870,39 @@ http_interactions:
         </status>
     http_version: 
   recorded_at: Tue, 10 Oct 2017 12:36:11 GMT
+- request:
+    method: get
+    uri: http://backend:5352/source/home:tom:branches:my_project/custom_name
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 404
+      message: project 'home tom branches my_project' does not exist
+    headers:
+      Content-Type:
+      - text/xml
+      Cache-Control:
+      - no-cache
+      Connection:
+      - close
+      Content-Length:
+      - '184'
+    body:
+      encoding: UTF-8
+      string: |
+        <status code="404">
+          <summary>project 'home:tom:branches:my_project' does not exist</summary>
+          <details>404 project 'home:tom:branches:my_project' does not exist</details>
+        </status>
+    http_version: 
+  recorded_at: Thu, 19 Oct 2017 08:13:54 GMT
 recorded_with: VCR 3.0.3