diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index 68262e4e8c..831122f332 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -152,7 +152,7 @@ $lang->my->dividerMenu = ',work,dynamic,';
 /* Program menu. */
 $lang->program->homeMenu = new stdclass();
 $lang->program->homeMenu->browse      = array('link' => "{$lang->program->projectView}|program|browse|", 'alias' => 'create,edit', 'subModule' => 'project');
-$lang->program->homeMenu->productView = array('link' => "{$lang->program->productView}|program|productview|", 'alias' => 'create,edit', 'subModule' => 'project');
+$lang->program->homeMenu->productView = array('link' => "{$lang->program->productView}|program|productview|", 'alias' => 'create,edit', 'subModule' => 'project,product');
 $lang->program->homeMenu->kanban      = array('link' => "{$lang->program->kanban}|program|kanban|");
 
 $lang->program->menu = new stdclass();
diff --git a/module/product/control.php b/module/product/control.php
index 2e6dec4f1b..504ca9b26e 100755
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -279,7 +279,7 @@ class product extends control
         if(empty($productIdList)) return $this->locate($this->session->productList);
 
         /* Set menu when page come from program. */
-        if($this->app->tab == 'program') common::setMenuVars('program', 0);
+        if($this->app->tab == 'program' && $programID) common::setMenuVars('program', $programID);
 
         if($this->config->vision == 'or') unset($this->lang->product->statusList['normal']);