diff --git a/module/design/view/view.html.php b/module/design/view/view.html.php
index 2c5f1412f5..82d9aaad03 100644
--- a/module/design/view/view.html.php
+++ b/module/design/view/view.html.php
@@ -13,7 +13,8 @@
 <?php include '../../common/view/header.html.php';?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
-    <?php echo html::a($this->createLink('design', 'browse', "productID=$design->product"), '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "class='btn btn-secondary'");?>
+    <?php $browseLink = $app->session->designList != false ? $app->session->designList : $this->createLink('design', 'browse', "productID=$design->product");?>
+    <?php echo html::a($browseLink, '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "class='btn btn-secondary'");?>
     <div class="divider"></div>
     <div class="page-title">
       <span class="label label-id"><?php echo $design->id?></span>
diff --git a/module/repo/control.php b/module/repo/control.php
index f71c135bd7..d6cd0ecd39 100644
--- a/module/repo/control.php
+++ b/module/repo/control.php
@@ -465,7 +465,10 @@ class repo extends control
         $this->repo->setMenu($this->repos, $repoID);
         $this->repo->setBackSession();
         if($repoID == 0) $repoID = $this->session->repoID;
-        $repo  = $this->repo->getRepoByID($repoID);
+        $repo = $this->repo->getRepoByID($repoID);
+
+        /* Save session. */
+        $this->session->set('revisionList', $this->app->getURI(true));
 
         $this->scm->setEngine($repo);
         $log = $this->scm->log('', $revision, $revision);
diff --git a/module/repo/view/revision.html.php b/module/repo/view/revision.html.php
index 26919dcf7b..02c605ab28 100644
--- a/module/repo/view/revision.html.php
+++ b/module/repo/view/revision.html.php
@@ -19,7 +19,8 @@ $typeInfo = $type == 'file' ? '&type=file' : '';
 <?php include '../../common/view/header.html.php';?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
-    <?php echo html::a($this->repo->createLink('browse', "repoID={$repoID}{$preDir}"), "<i class='icon icon-back'></i>" . $lang->goback, '', "class='btn btn-link'");?>
+    <?php $browseLink = $app->session->revisionList != false ? $app->session->revisionList : $this->repo->createLink('browse', "repoID={$repoID}{$preDir}");?>
+    <?php echo html::a($browseLink, "<i class='icon icon-back'></i>" . $lang->goback, '', "class='btn btn-link'");?>
     <div class="divider"></div>
     <div class="page-title">
       <?php echo $lang->repo->revisionA . ' ' . ($repo->SCM == 'Git' ? $this->repo->getGitRevisionName($revision, $log->commit) : $revision);?>
diff --git a/module/story/control.php b/module/story/control.php
index f8866ac8cf..db26accf8e 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -1360,7 +1360,13 @@ class story extends control
         }
 
         /* Save session. */
-        $this->session->set('storyList', $this->app->getURI(true));
+        $this->session->set('storyList',    $this->app->getURI(true));
+        $this->session->set('designList',   $this->app->getURI(true));
+        $this->session->set('bugList',      $this->app->getURI(true));
+        $this->session->set('caseList',     $this->app->getURI(true));
+        $this->session->set('bugList',      $this->app->getURI(true));
+        $this->session->set('revisionList', $this->app->getURI(true));
+
 
         /* Load pager and get tracks. */
         $this->app->loadClass('pager', $static = true);