diff --git a/module/execution/js/tree.js b/module/execution/js/tree.js
index 3e0513c76b..5503634ad1 100644
--- a/module/execution/js/tree.js
+++ b/module/execution/js/tree.js
@@ -185,6 +185,7 @@ $(function()
     $taskTree.on('click', '.tree-link', function(e)
     {
         var $link = $(this);
+        $.zui.store.set('project/tree/parentLi', $link.closest('li').attr('data-id').length > 0 ? $link.closest('li').attr('data-id') : '')
         showItem($link.attr('href'), $link.find('.title').text());
         $taskTree.find('li.selected').removeClass('selected');
         $link.closest('li').addClass('selected');
@@ -205,10 +206,11 @@ $(function()
     }).on('ready', function()
     {
         var lastUrl = $.zui.store.get('project/tree/showItem');
+        var lastLi  = $.zui.store.get('project/tree/parentLi');
         if(lastUrl)
         {
             showItem(lastUrl);
-            $taskTree.find('.tree-link[href="' + lastUrl + '"]').closest('li').addClass('selected');
+            $taskTree.find('li[data-id="' + lastLi + '"]').find('.tree-link[href="' + lastUrl + '"]').closest('li').addClass('selected');
         }
     });
 });
diff --git a/module/execution/view/treetask.html.php b/module/execution/view/treetask.html.php
index 388aa093bf..287204f2ee 100644
--- a/module/execution/view/treetask.html.php
+++ b/module/execution/view/treetask.html.php
@@ -75,7 +75,7 @@
   <div class='detail-title'><?php echo $lang->task->case;?></div>
   <div class='detail-content article-content'>
     <ul class='list-unstyled'>
-      <?php foreach($task->cases as $caseID => $case) echo '<li>' . html::a($this->createLink('testcase', 'view', "caseID=$caseID", '', true), "#$caseID " . $case, '', "data-toggle='modal' data-type='iframe' data-width='90%'") . '</li>';?>
+      <?php foreach($task->cases as $caseID => $case) echo '<li>' . html::a($this->createLink('testcase', 'view', "caseID=$caseID"), "#$caseID " . $case) . '</li>';?>
     </ul>
   </div>
 </div>