diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 35078657c9..8d4f94e1e4 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -30,11 +30,12 @@
     <div>
       <?php
       $params = "bugID=$bug->id";
+      $browseLink = $app->session->bugList != false ? $app->session->bugList : $this->createLink('bug', 'browse', "productID=$bug->product");
       common::printLink('bug', 'edit', $params, $lang->bug->buttonEdit);
       if(!($bug->status == 'active'   and common::printLink('bug', 'resolve', $params, $lang->bug->buttonResolve)))   echo $lang->bug->buttonResolve . ' ';
       if(!($bug->status == 'resolved' and common::printLink('bug', 'close', $params, $lang->bug->buttonClose)))       echo $lang->bug->buttonClose . ' ';
       if(!(($bug->status == 'closed' or $bug->status == 'resolved') and common::printLink('bug', 'activate', $params, $lang->bug->buttonActivate))) echo $lang->bug->buttonActivate . ' ';
-      common::printLink('bug', 'browse', '', $lang->bug->buttonToList);
+      echo html::a($browseLink, $lang->goback);
       ?>
     </div>
   </div>