diff --git a/module/block/control.php b/module/block/control.php
index 10d0aca623..09cc1ff2ea 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -542,6 +542,7 @@ class block extends control
         $this->session->set('todoList', $uri);
         $this->session->set('bugList',  $uri);
         $this->session->set('taskList', $uri);
+        $this->session->set('riskList', $uri);
 
         foreach($todos as $key => $todo)
         {
diff --git a/module/risk/view/view.html.php b/module/risk/view/view.html.php
index 55ed1bf0af..f80420bd91 100644
--- a/module/risk/view/view.html.php
+++ b/module/risk/view/view.html.php
@@ -1,6 +1,6 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<?php $browseLink = $this->createLink('risk', 'browse');?>
+<?php $browseLink = $app->session->riskList != false ? $app->session->riskList : $this->createLink('risk', 'browse');?>
 <?php js::set('sysurl', common::getSysUrl());?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">