diff --git a/lib/zin/wg/relatedlist/v1.php b/lib/zin/wg/relatedlist/v1.php
index 5a81709317..b2ae3709d5 100644
--- a/lib/zin/wg/relatedlist/v1.php
+++ b/lib/zin/wg/relatedlist/v1.php
@@ -36,6 +36,7 @@ class relatedList extends wg
         if(isset($item->branchName)) $info['leading']['html'] = wg(branchLabel::create($item->branch, $item->branchName))->render() . $info['leading']['html'];
 
         $props = isset($group['props']) ? $group['props'] : array('data-toggle' => 'modal', 'data-size' => 'lg');
+        if($type == 'build' && empty($item->execution)) $props['data-app'] = 'project';
         if($props) $info = array_merge($info, $props);
 
         return $info;
diff --git a/lib/zin/wg/relatedobjectlist/v1.php b/lib/zin/wg/relatedobjectlist/v1.php
index b85053f285..5e7a189617 100644
--- a/lib/zin/wg/relatedobjectlist/v1.php
+++ b/lib/zin/wg/relatedobjectlist/v1.php
@@ -61,8 +61,6 @@ class relatedObjectList extends relatedList
             if(!isset($relatedObjectTypeList[$relatedObjectType])) $relatedObjectTypeList[$relatedObjectType] = $app->loadLang($relatedObjectType)->$relatedObjectType->common;
             $itemType = $relatedObjectTypeList[$relatedObjectType];
         }
-        $tab = $app->tab == 'product' ? 'project' : $app->tab;
-        if($app->tab == 'system') $tab = 'project';
 
         $item = new stdClass();
         $item->id         = $relatedObjectID;
@@ -70,7 +68,7 @@ class relatedObjectList extends relatedList
         $item->type       = $itemType;
         $item->url        = !empty($relatedObjectInfo['url']) ? $relatedObjectInfo['url'] : null;
         $item->titleAttrs = !empty($relatedObjectInfo['url']) && !in_array($relatedObjectType, array('repocommit', 'commit', 'mr', 'release', 'build')) ? array('data-toggle' => 'modal', 'data-size' => 'lg') : null;
-        $item->titleAttrs = !empty($relatedObjectInfo['url']) && $relatedObjectType == 'build' ? array('data-app' => $tab) : null;
+        $item->titleAttrs = !empty($relatedObjectInfo['url']) && $relatedObjectType == 'build' ? array('data-app' => zget($relatedObjectInfo, 'tab', '')) : null;
         if(isset($relatedObjectInfo['status'])) $item->status = $relatedObjectInfo['status'];
 
         if(hasPriv('custom', 'removeObjects'))