diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php
index aa18d5ecae..fe31522f6a 100644
--- a/module/build/view/view.html.php
+++ b/module/build/view/view.html.php
@@ -26,7 +26,11 @@ tbody tr td:first-child input {display: none;}
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
     <?php $browseLink = $this->session->buildList ? $this->session->buildList : $this->createLink('execution', 'build', "executionID=$build->execution");?>
-    <?php common::printBack($browseLink, 'btn btn-secondary');?>
+    <?php
+    $dataApp = strpos($browseLink, 'release') !== false ? 'data-app=product' : '';
+    if(strpos($browseLink, 'projectrelease') !== false) $dataApp = 'data-app=project';
+    ?>
+    <?php common::printBack($browseLink, 'btn btn-secondary', $dataApp);?>
     <div class='divider'></div>
     <div class='page-title'>
       <span title='<?php echo $build->name;?>'>
diff --git a/module/projectrelease/control.php b/module/projectrelease/control.php
index 18a016922d..12afaadbaf 100644
--- a/module/projectrelease/control.php
+++ b/module/projectrelease/control.php
@@ -69,7 +69,10 @@ class projectrelease extends control
      */
     public function browse($projectID = 0, $executionID = 0, $type = 'all', $orderBy = 't1.date_desc', $recTotal = 0, $recPerPage = 15, $pageID = 1)
     {
-        $this->session->set('releaseList', $this->app->getURI(true), 'project');
+        $uri = $this->app->getURI(true);
+        $this->session->set('releaseList', $uri, 'project');
+        $this->session->set('buildList', $uri);
+
         $project   = $this->project->getById($projectID);
         $execution = $this->loadModel('execution')->getById($executionID);
 
@@ -226,9 +229,6 @@ class projectrelease extends control
      */
     public function view($releaseID, $type = 'story', $link = 'false', $param = '', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 100, $pageID = 1)
     {
-        $this->session->set('buildList', $this->app->getURI(true), 'execution');
-        $this->session->set('storyList', $this->app->getURI(true), $this->app->tab);
-
         $this->loadModel('story');
         $this->loadModel('bug');
 
@@ -243,6 +243,11 @@ class projectrelease extends control
             return print(js::error($this->lang->notFound) . js::locate('back'));
         }
 
+        $uri = $this->app->getURI(true);
+        if($release->build)  $this->session->set('buildList', $uri);
+        if($type == 'story') $this->session->set('storyList', $uri, $this->app->tab);
+        if($type == 'bug' or $type == 'leftBug') $this->session->set('bugList', $uri, $this->app->tab);
+
         $sort = common::appendOrder($orderBy);
         if(strpos($sort, 'pri_') !== false) $sort = str_replace('pri_', 'priOrder_', $sort);
 
diff --git a/module/release/control.php b/module/release/control.php
index 6446cbfdd1..60ff264024 100644
--- a/module/release/control.php
+++ b/module/release/control.php
@@ -46,7 +46,10 @@ class release extends control
         $this->app->loadClass('pager', $static = true);
         $pager = new pager($recTotal, $recPerPage, $pageID);
         $this->commonAction($productID, $branch);
-        $this->session->set('releaseList', $this->app->getURI(true), 'product');
+
+        $uri = $this->app->getURI(true);
+        $this->session->set('releaseList', $uri, 'product');
+        $this->session->set('buildList', $uri);
 
         $this->view->title      = $this->view->product->name . $this->lang->colon . $this->lang->release->browse;
         $this->view->position[] = $this->lang->release->browse;
@@ -167,8 +170,10 @@ class release extends control
         $release   = $this->release->getByID($releaseID, true);
         if(!$release) return print(js::error($this->lang->notFound) . js::locate($this->createLink('product', 'index')));
 
-        if($type == 'story') $this->session->set('storyList', $this->app->getURI(true), 'product');
-        if($type == 'bug' or $type == 'leftBug') $this->session->set('bugList', $this->app->getURI(true), 'qa');
+        $uri = $this->app->getURI(true);
+        if(!empty($release->build)) $this->session->set('buildList', $uri);
+        if($type == 'story') $this->session->set('storyList', $uri, 'product');
+        if($type == 'bug' or $type == 'leftBug') $this->session->set('bugList', $uri, 'qa');
 
         $this->loadModel('story');
         $this->loadModel('bug');