diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index 2eae7ec696..373db1cbbc 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -327,7 +327,7 @@ js::set('moduleID', $moduleID);
             <td colspan="3" class="text-center form-actions">
               <?php $browseLink = $this->session->bugList ? $this->session->bugList : $this->inlink('browse', "productID=$productID");?>
               <?php echo html::submitButton();?>
-              <?php if($caseID) echo html::linkButton($lang->goback, $browseLink, 'self', '', 'btn btn-wide');?>
+              <?php if($caseID) echo html::a($browseLink, $lang->goback, '', 'class="btn btn-wide"');?>
               <?php if(!$caseID) echo html::backButton();?>
               <?php echo html::hidden('case', (int)$caseID) . html::hidden('caseVersion', (int)$version);?>
               <?php echo html::hidden('result', (int)$runID) . html::hidden('testtask', empty($testtask) ? 0 : $testtask->id);?>
diff --git a/module/my/control.php b/module/my/control.php
index da5da01193..23d214c21b 100644
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -443,7 +443,9 @@ class my extends control
         $this->loadModel('testtask');
 
         /* Save session. */
-        $this->session->set('caseList', $this->app->getURI(true), 'qa');
+        $uri = $this->app->getURI(true);
+        $this->session->set('caseList', $uri, 'qa');
+        $this->session->set('bugList',  $uri . "#app={$this->app->tab}", 'qa');
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);