diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 14217ea5f6..07f84b5b8c 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -143,7 +143,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
     <div class='btn-group dropdown'>
       <?php $buttonType = $from == 'project' ? 'btn-secondary' : 'btn-primary';?>
       <?php $extraParam = $from == 'project' ? '' : "&bugID=0&planID=0&todoID=0&extra=&type=$storyType";?>
-      <?php echo html::a($this->createLink('story', 'create', "product=$productID&branch=$branch&moduleID=$moduleID&storyID=0&projectID=0$extraParam"), "<i class='icon icon-plus'></i> {$lang->story->create}", '', "class='btn $buttonType' data-app='$openApp'");?>
+      <?php echo html::a($this->createLink('story', 'create', "product=$productID&branch=$branch&moduleID=$moduleID&storyID=0&projectID={$this->session->project}$extraParam"), "<i class='icon icon-plus'></i> {$lang->story->create}", '', "class='btn $buttonType' data-app='$openApp'");?>
       <?php if(!empty($productID)): ?>
       <button type='button' class="btn <?php echo $buttonType?> dropdown-toggle" data-toggle='dropdown'><span class='caret'></span></button>
       <ul class='dropdown-menu pull-right'>
diff --git a/module/story/control.php b/module/story/control.php
index 909181391e..db0749f342 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -196,9 +196,6 @@ class story extends control
         $moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'story', 0, $branch);
         if(empty($moduleOptionMenu)) die(js::locate(helper::createLink('tree', 'browse', "productID=$productID&view=story")));
 
-        /* Set menu. */
-        $this->product->setMenu($product->id, $branch);
-
         /* Init vars. */
         $source     = '';
         $sourceNote = '';