diff --git a/module/execution/view/ajaxgetdropmenu.html.php b/module/execution/view/ajaxgetdropmenu.html.php
index c9077726f2..7ae7f3bf3a 100644
--- a/module/execution/view/ajaxgetdropmenu.html.php
+++ b/module/execution/view/ajaxgetdropmenu.html.php
@@ -29,8 +29,6 @@ a.executionName:focus, a.executionName:hover {background: #0c64eb; color: #fff !
 #swapper li > a {padding-top: 4px; padding-bottom: 4px;}
 #swapper li {padding-top: 0; padding-bottom: 0;}
 #swapper .tree li>.list-toggle {top: -1px;}
-
-.col-right {padding-top: 30px;}
 </style>
 <?php
 $executionCounts      = array();
@@ -147,8 +145,11 @@ $(function()
 
     $('.nav-tabs>li a').click(function()
     {
-        $(this).siblings().show();
-        $(this).parent().siblings('li').find('span').hide();
+        if($('#swapper input[type="search"]').val() == '')
+        {
+            $(this).siblings().show();
+            $(this).parent().siblings('li').find('span').hide();
+        }
     })
 
     $('#swapper [data-ride="tree"]').tree('expand');
@@ -158,11 +159,13 @@ $(function()
         if(value != '')
         {
             $('div.hide-in-search').siblings('i').addClass('hide-in-search');
+            $('.nav-tabs li span').hide();
         }
         else
         {
             $('div.hide-in-search').siblings('i').removeClass('hide-in-search');
             $('li.has-list div.hide-in-search').removeClass('hidden');
+            $('.nav-tabs li.active').find('span').show();
         }
     })
 })
diff --git a/module/product/view/ajaxgetdropmenu.html.php b/module/product/view/ajaxgetdropmenu.html.php
index 14ee1190b5..8d1560446a 100644
--- a/module/product/view/ajaxgetdropmenu.html.php
+++ b/module/product/view/ajaxgetdropmenu.html.php
@@ -30,8 +30,6 @@ a.productName:focus, a.productName:hover {background: #0c64eb; color: #fff !impo
 #swapper li > a {padding-top: 4px; padding-bottom: 4px;}
 #swapper li {padding-top: 0; padding-bottom: 0;}
 #swapper .tree li>.list-toggle {top: -1px;}
-
-.col-right {padding-top: 30px;}
 </style>
 <?php
 $productCounts      = array();
@@ -153,8 +151,11 @@ $(function()
 
     $('.nav-tabs>li a').click(function()
     {
-        $(this).siblings().show();
-        $(this).parent().siblings('li').find('span').hide();
+        if($('#swapper input[type="search"]').val() == '')
+        {
+            $(this).siblings().show();
+            $(this).parent().siblings('li').find('span').hide();
+        }
     })
 
     $('#swapper [data-ride="tree"]').tree('expand');
@@ -164,11 +165,13 @@ $(function()
         if(value != '')
         {
             $('div.hide-in-search').siblings('i').addClass('hide-in-search');
+            $('.nav-tabs li span').hide();
         }
         else
         {
             $('div.hide-in-search').siblings('i').removeClass('hide-in-search');
             $('li.has-list div.hide-in-search').removeClass('hidden');
+            $('.nav-tabs li.active').find('span').show();
         }
     })
 })
diff --git a/module/project/view/ajaxgetdropmenu.html.php b/module/project/view/ajaxgetdropmenu.html.php
index 62b26e9abd..fedd95f732 100644
--- a/module/project/view/ajaxgetdropmenu.html.php
+++ b/module/project/view/ajaxgetdropmenu.html.php
@@ -29,8 +29,6 @@ a.projectName:focus, a.projectName:hover {background: #0c64eb; color: #fff !impo
 #swapper li > a {padding-top: 4px; padding-bottom: 4px;}
 #swapper li {padding-top: 0; padding-bottom: 0;}
 #swapper .tree li>.list-toggle {top: -1px;}
-
-.col-right {padding-top: 30px;}
 </style>
 <?php
 $projectCounts      = array();
@@ -155,8 +153,11 @@ $(function()
 
     $('.nav-tabs>li a').click(function()
     {
-        $(this).siblings().show();
-        $(this).parent().siblings('li').find('span').hide();
+        if($('#swapper input[type="search"]').val() == '')
+        {
+            $(this).siblings().show();
+            $(this).parent().siblings('li').find('span').hide();
+        }
     })
 
     $('#swapper [data-ride="tree"]').tree('expand');
@@ -166,11 +167,13 @@ $(function()
         if(value != '')
         {
             $('div.hide-in-search').siblings('i').addClass('hide-in-search');
+            $('.nav-tabs li span').hide();
         }
         else
         {
             $('div.hide-in-search').siblings('i').removeClass('hide-in-search');
             $('li.has-list div.hide-in-search').removeClass('hidden');
+            $('.nav-tabs li.active').find('span').show();
         }
     })
 })