diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 7e3d604ed8..e7ac1c9f64 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -599,7 +599,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
       </div>
       <div class="modal-body">
         <div class='input-group'>
-          <?php echo html::select('plan', $productPlans[$productID], '', "class='form-control chosen' id='plan'");?>
+          <?php echo html::select('plan', isset($productPlans[$productID]) ? $productPlans[$productID] : '', '', "class='form-control chosen' id='plan'");?>
           <span class='input-group-btn'><?php echo html::commonButton($lang->execution->linkStory, "id='toTaskButton'", 'btn btn-primary');?></span>
         </div>
       </div>
diff --git a/module/stakeholder/view/browse.html.php b/module/stakeholder/view/browse.html.php
index 395b4963e2..84a65b8246 100644
--- a/module/stakeholder/view/browse.html.php
+++ b/module/stakeholder/view/browse.html.php
@@ -14,7 +14,7 @@
 <?php js::set('confirmDelete', $lang->stakeholder->confirmDelete);?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
-    <?php echo html::a($this->createLink('stakeholder', 'browse', 'browseType=all'), '<span class="text">' . $lang->stakeholder->browse . '</span>', '', 'class="btn btn-link btn-active-text"');?>
+    <?php echo html::a($this->createLink('stakeholder', 'browse', "projectID=$projectID"), '<span class="text">' . $lang->stakeholder->browse . '</span>', '', 'class="btn btn-link btn-active-text"');?>
   </div>
   <div class="btn-toolbar pull-right">
     <?php if(common::hasPriv('stakeholder', 'batchcreate') and common::hasPriv('stakeholder', 'create')):?>