diff --git a/module/common/model.php b/module/common/model.php
index 715cc27603..b83bb4581b 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -539,7 +539,7 @@ class commonModel extends model
 
         if(!$openApp) return;
         $icon = zget($lang->navIcons, $openApp, '');
-        
+
         if(!in_array($openApp, array('program', 'product', 'project')))
         {
             $nav = $lang->mainNav->$openApp;
@@ -1300,13 +1300,16 @@ EOD;
         global $lang, $app;
         if(isonlybody()) return false;
 
+        $moduleName = ($app->getModuleName() == 'story' and $app->openApp == 'project') ? 'projectstory' : $app->getModuleName();
         echo "<nav class='container'>";
         if(isset($preAndNext->pre) and $preAndNext->pre)
         {
             $id = (isset($_SESSION['testcaseOnlyCondition']) and !$_SESSION['testcaseOnlyCondition'] and $app->getModuleName() == 'testcase' and isset($preAndNext->pre->case)) ? 'case' : 'id';
             $title = isset($preAndNext->pre->title) ? $preAndNext->pre->title : $preAndNext->pre->name;
             $title = '#' . $preAndNext->pre->$id . ' ' . $title . ' ' . $lang->preShortcutKey;
-            $link  = $linkTemplate ? sprintf($linkTemplate, $preAndNext->pre->$id) : inLink('view', "ID={$preAndNext->pre->$id}");
+
+            $link  = $linkTemplate ? sprintf($linkTemplate, $preAndNext->pre->$id) : helper::createLink($moduleName, 'view', "ID={$preAndNext->pre->$id}");
+            $link .= '#app=' . $app->openApp;
             echo html::a($link, '<i class="icon-pre icon-chevron-left"></i>', '', "id='prevPage' class='btn' title='{$title}'");
         }
         if(isset($preAndNext->next) and $preAndNext->next)
@@ -1314,7 +1317,8 @@ EOD;
             $id = (isset($_SESSION['testcaseOnlyCondition']) and !$_SESSION['testcaseOnlyCondition'] and $app->getModuleName() == 'testcase' and isset($preAndNext->next->case)) ? 'case' : 'id';
             $title = isset($preAndNext->next->title) ? $preAndNext->next->title : $preAndNext->next->name;
             $title = '#' . $preAndNext->next->$id . ' ' . $title . ' ' . $lang->nextShortcutKey;
-            $link  = $linkTemplate ? sprintf($linkTemplate, $preAndNext->next->$id) : inLink('view', "ID={$preAndNext->next->$id}");
+            $link  = $linkTemplate ? sprintf($linkTemplate, $preAndNext->next->$id) : helper::createLink($moduleName, 'view', "ID={$preAndNext->next->$id}");
+            $link .= '#app=' . $app->openApp;
             echo html::a($link, '<i class="icon-pre icon-chevron-right"></i>', '', "id='nextPage' class='btn' title='$title'");
         }
         echo '</nav>';
diff --git a/module/project/model.php b/module/project/model.php
index 424efc8225..12ad0641a4 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1608,19 +1608,19 @@ class projectModel extends model
             $projectSubMenu = $this->lang->project->menu->{$key}['dropMenu'];
             $dropMenu = common::createDropMenu($this->lang->project->menu->{$key}['dropMenu'], $objectID);
             if(!empty($dropMenu))
-            {    
+            {
                 foreach($dropMenu as $menuKey => $menu)
-                {    
-                    $itemMenu = zget($projectSubMenu, $menuKey, ''); 
+                {
+                    $itemMenu = zget($projectSubMenu, $menuKey, '');
                     $isActive['method']    = ($moduleName == strtolower($menu->link['module']) and $methodName == strtolower($menu->link['method']));
                     $isActive['alias']     = ($moduleName == strtolower($menu->link['module']) and (is_array($itemMenu) and isset($itemMenu['alias']) and strpos($itemMenu['alias'], $methodName) !== false));
                     $isActive['subModule'] = (is_array($itemMenu) and isset($itemMenu['subModule']) and strpos($itemMenu['subModule'], $moduleName) !== false);
                     if($isActive['method'] or $isActive['alias'] or $isActive['subModule'])
-                    {    
+                    {
                         $this->lang->project->menu->{$key}['link'] = $menu->text . "|" . join('|', $menu->link);
                         break;
-                    }    
-                }    
+                    }
+                }
                 $this->lang->project->menu->{$key}['dropMenu'] = $dropMenu;
             }
         }