diff --git a/module/design/view/ajaxgetdropmenu.html.php b/module/design/view/ajaxgetdropmenu.html.php
index 592e42260b..19ebf15310 100644
--- a/module/design/view/ajaxgetdropmenu.html.php
+++ b/module/design/view/ajaxgetdropmenu.html.php
@@ -1,10 +1,11 @@
 <?php js::set('productID', $productID);?>
 <?php
-$iCharges     = 0;
-$others       = 0;
-$closeds      = 0;
-$tab          = 'project';
-$productNames = array();
+$iCharges       = 0;
+$others         = 0;
+$closeds        = 0;
+$tab            = 'project';
+$productNames   = array();
+$currentProduct = '';
 
 foreach($products as $product)
 {
@@ -20,6 +21,7 @@ $closedProductsHtml = '';
 
 foreach($products as $product)
 {
+    if($product->id == $productID) $currentProduct = $product;
     $selected    = $product->id == $productID ? 'selected' : '';
     $productName = $product->name;
     $linkHtml    = sprintf($link, $product->id);
@@ -61,4 +63,13 @@ foreach($products as $product)
    <div class='list-group'><?php echo $closedProductsHtml;?></div>
   </div>
 </div>
-<script>scrollToSelected();</script>
+<script>
+$(function()
+{
+    <?php if($currentProduct->status == 'closed'):?>
+    $('.col-footer .toggle-right-col').click(function(){ scrollToSelected(); })
+    <?php else:?>
+    scrollToSelected();
+    <?php endif;?>
+});
+</script>
diff --git a/module/doc/view/objectlibs.html.php b/module/doc/view/objectlibs.html.php
index 26478698e9..0a62ccfc60 100644
--- a/module/doc/view/objectlibs.html.php
+++ b/module/doc/view/objectlibs.html.php
@@ -46,10 +46,7 @@ $('#pageNav .btn-group.angle-btn').click(function()
     if($(this).hasClass('opened')) return;
     $(this).addClass('opened');
 
-    setTimeout(function()
-    {
-        scrollToSelected();
-    }, 100);
+    scrollToSelected();
 })
 </script>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/doc/view/tablecontents.html.php b/module/doc/view/tablecontents.html.php
index 6442f4f00a..ac73086360 100644
--- a/module/doc/view/tablecontents.html.php
+++ b/module/doc/view/tablecontents.html.php
@@ -124,4 +124,13 @@ if(empty($type)) $type = 'product';
     </div>
   </div>
 </div>
+<script>
+$('#pageNav .btn-group.angle-btn').click(function()
+{
+    if($(this).hasClass('opened')) return;
+    $(this).addClass('opened');
+
+    scrollToSelected();
+})
+</script>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/execution/view/ajaxgetdropmenu.html.php b/module/execution/view/ajaxgetdropmenu.html.php
index 553e3347b0..779e67a96b 100644
--- a/module/execution/view/ajaxgetdropmenu.html.php
+++ b/module/execution/view/ajaxgetdropmenu.html.php
@@ -31,6 +31,7 @@
 <?php
 $executionCounts      = array();
 $executionNames       = array();
+$currentExecution     = '';
 $tabActive            = '';
 $myExecutions         = 0;
 $others               = 0;
@@ -82,11 +83,13 @@ foreach($executions as $projectID => $projectExecutions)
         if(isset($execution->type) and $execution->type == 'kanban' and !$isKanbanMethod) $executionLink = $kanbanLink;
         if(isset($execution->type) and $execution->type != 'kanban' and strpos(',kanban,cfd,', ",$method,") !== false) $executionLink = $taskLink;
 
+        if($execution->id == $executionID) $currentExecution = $execution;
         $selected = $execution->id == $executionID ? 'selected' : '';
         if(!empty($execution->children))
         {
             foreach($execution->children as $id)
             {
+                if($execution->id == $executionID) $currentExecution = $execution;
                 $selected = $id == $executionID ? 'selected' : '';
                 if($execution->status != 'done' and $execution->status != 'closed' and ($execution->PM == $this->app->user->account or isset($execution->teams[$this->app->user->account])))
                 {
@@ -180,10 +183,14 @@ $closedExecutionsHtml .= '</ul>';
    <div class='list-group executions'><?php echo $closedExecutionsHtml;?></div>
   </div>
 </div>
-<script>scrollToSelected();</script>
 <script>
 $(function()
 {
+    <?php if($currentExecution->status == 'done' or $currentExecution->status == 'closed'):?>
+    $('.col-footer .toggle-right-col').click(function(){ scrollToSelected(); })
+    <?php else:?>
+    scrollToSelected();
+    <?php endif;?>
     $('.nav-tabs li span').hide();
     $('.nav-tabs li.active').find('span').show();
 
diff --git a/module/kanban/view/ajaxgetkanbanmenu.html.php b/module/kanban/view/ajaxgetkanbanmenu.html.php
index 2c3c1faed4..14a5be5ad6 100644
--- a/module/kanban/view/ajaxgetkanbanmenu.html.php
+++ b/module/kanban/view/ajaxgetkanbanmenu.html.php
@@ -23,12 +23,13 @@
 #swapper .tree li>.list-toggle {top: -1px;}
 </style>
 <?php
-$kanbanCounts = array();
-$kanbanNames  = array();
-$tabActive    = '';
-$myKanbans    = 0;
-$others       = 0;
-$dones        = 0;
+$kanbanCounts  = array();
+$kanbanNames   = array();
+$tabActive     = '';
+$myKanbans     = 0;
+$others        = 0;
+$dones         = 0;
+$currentKanban = '';
 
 foreach($kanbanList as $spaceID => $spaceKanbans)
 {
@@ -64,6 +65,7 @@ foreach($kanbanList as $spaceID => $spaceKanbans)
 
     foreach($spaceKanbans as $index => $kanban)
     {
+        if($kanban->id == $kanbanID) $currentKanban = $kanban;
         $selected   = $kanban->id == $kanbanID ? 'selected' : '';
         $link       = helper::createLink('kanban', 'view', "kanbanID=%s", '', '', $kanban->id);
         $kanbanName = '<i class="icon icon-kanban"></i> ' . $kanban->name;
@@ -132,10 +134,15 @@ $closedKanbansHtml .= '</ul>';
    <div class='list-group kanbans'><?php echo $closedKanbansHtml;?></div>
   </div>
 </div>
-<script>scrollToSelected();</script>
 <script>
 $(function()
 {
+    <?php if($currentKanban->status == 'closed'):?>
+    $('.col-footer .toggle-right-col').click(function(){ scrollToSelected(); })
+    <?php else:?>
+    scrollToSelected();
+    <?php endif;?>
+
     $('#dropMenu .nav-tabs li span').hide();
     $('#dropMenu .nav-tabs li.active').find('span').show();
 
diff --git a/module/product/view/ajaxgetdropmenu.html.php b/module/product/view/ajaxgetdropmenu.html.php
index 7ff0508679..1bc8e9ad44 100644
--- a/module/product/view/ajaxgetdropmenu.html.php
+++ b/module/product/view/ajaxgetdropmenu.html.php
@@ -37,6 +37,7 @@ $tabActive          = '';
 $myProducts         = 0;
 $others             = 0;
 $closeds            = 0;
+$currentProduct     = '';
 
 foreach($products as $programID => $programProducts)
 {
@@ -72,6 +73,7 @@ foreach($products as $programID => $programProducts)
 
     foreach($programProducts as $index => $product)
     {
+        if($product->id == $productID) $currentProduct = $product;
         $selected    = $product->id == $productID ? 'selected' : '';
         $productName = ($config->systemMode == 'new' and $product->line) ? zget($lines, $product->line, '') . ' / ' . $product->name : $product->name;
         $linkHtml    = $this->product->setParamsForLink($module, $link, $projectID, $product->id);
@@ -144,10 +146,15 @@ $closedProductsHtml .= '</ul>';
    <div class='list-group products'><?php echo $closedProductsHtml;?></div>
   </div>
 </div>
-<script>scrollToSelected();</script>
 <script>
 $(function()
 {
+    <?php if($currentProduct->status == 'closed'):?>
+    $('.col-footer .toggle-right-col').click(function(){ scrollToSelected(); })
+    <?php else:?>
+    scrollToSelected();
+    <?php endif;?>
+
     $('.nav-tabs li span').hide();
     $('.nav-tabs li.active').find('span').show();
 
diff --git a/module/project/view/ajaxgetdropmenu.html.php b/module/project/view/ajaxgetdropmenu.html.php
index 20d4d9d623..489bf64498 100644
--- a/module/project/view/ajaxgetdropmenu.html.php
+++ b/module/project/view/ajaxgetdropmenu.html.php
@@ -35,6 +35,7 @@ $tabActive          = '';
 $myProjects         = 0;
 $others             = 0;
 $dones              = 0;
+$currentProject     = '';
 
 foreach($projects as $programID => $programProjects)
 {
@@ -70,8 +71,9 @@ foreach($projects as $programID => $programProjects)
 
     foreach($programProjects as $index => $project)
     {
-        $selected    = $project->id == $projectID ? 'selected' : '';
-        $icon        = '<i class="icon icon-sprint"></i> ';
+        if($project->id == $projectID) $currentProject = $project;
+        $selected = $project->id == $projectID ? 'selected' : '';
+        $icon     = '<i class="icon icon-sprint"></i> ';
 
         if($project->model != 'waterfall' and (in_array($module, $config->waterfallModules) or $method == 'track'))
         {
@@ -163,10 +165,15 @@ $closedProjectsHtml .= '</ul>';
    <div class='list-group projects'><?php echo $closedProjectsHtml;?></div>
   </div>
 </div>
-<script>scrollToSelected();</script>
 <script>
 $(function()
 {
+    <?php if($currentProject->status == 'done' or $currentProject->status == 'closed'):?>
+    $('.col-footer .toggle-right-col').click(function(){ scrollToSelected(); })
+    <?php else:?>
+    scrollToSelected();
+    <?php endif;?>
+
     $('.nav-tabs li span').hide();
     $('.nav-tabs li.active').find('span').show();
 
diff --git a/www/js/my.full.js b/www/js/my.full.js
index dad5f587d5..b2ed2f518c 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -930,19 +930,21 @@ function adjustMenuWidth()
  * @access public
  * @return void
  */
-function scrollToSelected(id)
+function scrollToSelected()
 {
-    if(typeof(id) == 'undefined') id = '#dropMenu .table-col .list-group'
-
-    $id = $(id);
-    $selected = $id.find('.selected');
-
-    $id.mouseout(function(){$(this).find('a.active:not(.not-list-item)').removeClass('active')});
-    if($selected.length > 0)
+    setTimeout(function()
     {
-        var offsetHeight = 75;
-        $id.scrollTop($selected.position().top - offsetHeight);
-    }
+        $selected = $('#dropMenu .selected');
+        if($selected.length == 0) return;
+
+        $id = $selected.closest('.list-group');
+        $id.mouseout(function(){$(this).find('a.active:not(.not-list-item)').removeClass('active')});
+
+        var fixOffset = 160;
+        offsetTop = $selected.offset().top;
+        if(offsetTop < fixOffset) return;
+        $id.scrollTop(offsetTop - fixOffset);
+    }, 100);
 }
 
 /**