diff --git a/lib/base/front/front.class.php b/lib/base/front/front.class.php
index eddd8a7fe9..5453697c61 100644
--- a/lib/base/front/front.class.php
+++ b/lib/base/front/front.class.php
@@ -509,17 +509,10 @@ class baseHTML
             setcookie('goback', json_encode($gobackList), $config->cookieLife, $config->webRoot, '', $config->cookieSecure, false);
         }
 
-        $dataApp = '';
-        foreach($gobackList as $locateApp => $locateLink)
-        {
-            if($gobackLink == $locateLink)
-            {
-                $dataApp = $locateApp;
-                continue;
-            }
-        }
+        $dataApp = array_search($gobackLink, $gobackList) ? array_search($gobackLink, $gobackList) : '';
+        $dataApp = empty($dataApp) ? '' : "data-app='$dataApp'";
 
-        return  "<a href='{$gobackLink}' class='btn btn-back $class' data-app='$dataApp' $misc>{$label}</a>";
+        return  "<a href='{$gobackLink}' class='btn btn-back $class' $dataApp $misc>{$label}</a>";
     }
 
     /**
diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php
index ae32d22a17..26b7a53e87 100644
--- a/module/program/view/browsebylist.html.php
+++ b/module/program/view/browsebylist.html.php
@@ -126,7 +126,7 @@
           <div class='btn-group'>
             <button type='button' class='btn dropdown-toggle' data-toggle='dropdown' title="<?php echo $this->lang->more;?>"><i class='icon-more-alt'></i></button>
             <ul class='dropdown-menu pull-right text-center' role='menu'>
-              <?php common::printIcon('project', 'manageProducts', "projectID=$program->id&from=browse", $program, 'list', 'link', '', "$class", '', "data-app='project'");?>
+              <?php common::printIcon('project', 'manageProducts', "projectID=$program->id", $program, 'list', 'link', '', '', false, "data-group='project'", '', $program->id);?>
               <?php common::printIcon('project', 'whitelist',      "projectID=$program->id&module=project&from=browse", $program, 'list', 'shield-check', '', "$class", '', "data-app='project'");?>
               <?php if(common::hasPriv('project','delete')) echo html::a($this->createLink("project", "delete", "projectID=$program->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn' title='{$this->lang->delete}' data-group='program'");?>
             </ul>
diff --git a/module/project/model.php b/module/project/model.php
index adacde8868..b1ed4dd278 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1785,6 +1785,7 @@ class projectModel extends model
                             echo "<div class='btn-group'>";
                             echo "<button type='button' class='btn dropdown-toggle' data-toggle='context-dropdown' title='{$this->lang->more}'><i class='icon-more-alt'></i></button>";
                             echo "<ul class='dropdown-menu pull-right text-center' role='menu'>";
+                            if($from == 'pgmproject') $dataApp = 'program';
                             common::printIcon($moduleName, 'manageProducts', "projectID=$project->id", $project, 'list', 'link', '', 'btn-action', '', $dataApp . $attr, $this->lang->project->manageProducts);
                             if($this->config->systemMode == 'new') common::printIcon('project', 'whitelist', "projectID=$project->id&module=project&from=$from", $project, 'list', 'shield-check', '', 'btn-action', '', $dataApp . $attr);
                             if(common::hasPriv($moduleName, 'delete')) echo html::a(helper::createLink($moduleName, "delete", "projectID=$project->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn btn-action' title='{$this->lang->project->delete}'");