diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index 08a0c5cc10..10e407a608 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -21,7 +21,7 @@
 <?php js::set('storyRecTotal', $storyPager->recTotal);?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
-    <?php $browseLink = $this->session->productPlanList ? $this->session->productPlanList : inlink('browse', "planID=$plan->id");?>
+    <?php $browseLink = $this->session->productPlanList ? $this->session->productPlanList : inlink('browse', "planID=$plan->product");?>
     <?php common::printBack($browseLink, 'btn btn-primary');?>
     <div class='divider'></div>
     <div class='page-title'>
diff --git a/module/program/control.php b/module/program/control.php
index 794166e07d..b19d657347 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -76,7 +76,9 @@ class program extends control
     public function kanban()
     {
         $this->app->loadLang('release');
-        $this->app->session->set('projectList', $this->app->getURI(true), 'project');
+
+        $this->session->set('projectList', $this->app->getURI(true), 'project');
+        $this->session->set('productPlanList', $this->app->getURI(true), 'product');
 
         $this->view->title       = $this->lang->program->kanban->common;
         $this->view->kanbanGroup = array_filter($this->program->getKanbanGroup());