diff --git a/trunk/module/story/view/activate.html.php b/trunk/module/story/view/activate.html.php
index 5c3d78b019..5afbe74893 100644
--- a/trunk/module/story/view/activate.html.php
+++ b/trunk/module/story/view/activate.html.php
@@ -37,7 +37,10 @@
     </tr>
     <tr>
       <td colspan='2' class='a-center'>
-        <?php echo html::submitButton() . html::linkButton($lang->goback, inlink('view', "storyID=$story->id"));?>
+        <?php 
+        echo html::submitButton();
+        echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"));
+        ?>
       </td>
     </tr>
   </table>
diff --git a/trunk/module/story/view/affected.html.php b/trunk/module/story/view/affected.html.php
index 5f30b331f9..adef69c454 100644
--- a/trunk/module/story/view/affected.html.php
+++ b/trunk/module/story/view/affected.html.php
@@ -15,6 +15,7 @@
           <th><?php echo $lang->task->consumed;?></th>
           <th><?php echo $lang->task->left;?></th>
         </tr>
+        <?php if(isset($story->tasks[$projectID])):?>
         <?php foreach($story->tasks[$projectID] as $task):?> 
         <tr class='a-center'>
           <td><?php echo $task->id;?></td>
@@ -25,6 +26,7 @@
           <td><?php echo $task->left;?></td>
         </tr>
         <?php endforeach;?>
+        <?php endif;?>
       </table>
     </td>
   </tr>
diff --git a/trunk/module/story/view/change.html.php b/trunk/module/story/view/change.html.php
index 653c4c8bfd..8a270629ff 100644
--- a/trunk/module/story/view/change.html.php
+++ b/trunk/module/story/view/change.html.php
@@ -48,7 +48,12 @@
       <td><?php echo $this->fetch('file', 'buildform', 'filecount=2');?></td>
     </tr>
   </table>
-  <div class='a-center'><?php echo html::submitButton() . html::linkButton($lang->goback, inlink('view', "storyID=$story->id"));?></div>
+  <div class='a-center'>
+    <?php 
+    echo html::submitButton();
+    echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"));
+    ?>
+  </div>
   <?php include './affected.html.php';?>
   <?php include '../../common/view/action.html.php';?>
   </form>
diff --git a/trunk/module/story/view/close.html.php b/trunk/module/story/view/close.html.php
index 1df0eab627..39c2d4e373 100644
--- a/trunk/module/story/view/close.html.php
+++ b/trunk/module/story/view/close.html.php
@@ -66,7 +66,7 @@ function setStory(reason)
     <tr>
       <td colspan='2' class='a-center'>
       <?php echo html::submitButton();?>
-      <?php echo html::linkButton($lang->goback, inlink('view', "storyID=$story->id"));?>
+      <?php echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"));?>
       </td>
     </tr>
   </table>
diff --git a/trunk/module/story/view/edit.html.php b/trunk/module/story/view/edit.html.php
index d07e1cc759..0c92676903 100644
--- a/trunk/module/story/view/edit.html.php
+++ b/trunk/module/story/view/edit.html.php
@@ -45,7 +45,12 @@
         <legend><?php echo $lang->story->comment;?></legend>
         <?php echo html::textarea('comment', '', "rows='5' class='area-1'");?>
       </fieldset>
-      <div class='a-center'><?php echo html::submitButton() .  html::linkButton($lang->goback, inlink('view', "storyID=$story->id"));?></div>
+      <div class='a-center'>
+        <?php 
+        echo html::submitButton();
+        echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"));
+        ?>
+      </div>
       <?php include '../../common/view/action.html.php';?>
     </div>
   </div>
diff --git a/trunk/module/story/view/review.html.php b/trunk/module/story/view/review.html.php
index eab8aaeb10..e88769ebe2 100644
--- a/trunk/module/story/view/review.html.php
+++ b/trunk/module/story/view/review.html.php
@@ -116,7 +116,7 @@ function setStory(reason)
     <tr>
       <td colspan='2' class='a-center'>
       <?php echo html::submitButton();?>
-      <?php echo html::linkButton($lang->goback, inlink('view', "storyID=$story->id"));?>
+      <?php echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"));?>
       </td>
     </tr>
   </table>