diff --git a/module/story/ui/view.html.php b/module/story/ui/view.html.php
index 8808ec0046..ce1a4f021e 100644
--- a/module/story/ui/view.html.php
+++ b/module/story/ui/view.html.php
@@ -525,6 +525,7 @@ detailBody
                             {
                                 global $app;
                                 $tab = $app->tab == 'product' ? 'project' : $app->tab;
+                                if(!$app->tab == 'system') $tab = 'product';
                                 return h::li
                                 (
                                     set::title($build->name),
@@ -545,6 +546,7 @@ detailBody
                                 global $app;
                                 $tab           = $app->tab == 'execution' ? 'product'        : $app->tab;
                                 $releaseModule = $app->tab == 'project'   ? 'projectrelease' : 'release';
+                                if(!$app->tab == 'system') $tab = 'product';
                                 return h::li
                                 (
                                     set::title($release->name),