diff --git a/js/menus/templates/EditComponentMenuView.html b/js/menus/templates/EditComponentMenuView.html
index e5508099ce69be2984c5b84fb4dd9a89a9eeb477..6c5bac1974551922e74d93daa3994f6edbfca952 100644
--- a/js/menus/templates/EditComponentMenuView.html
+++ b/js/menus/templates/EditComponentMenuView.html
@@ -11,7 +11,7 @@ Parent:   
         </ul>
     </div><br/><br/>
 <% if(!isStock){ %>
-    Children: &nbsp;&nbsp;
+    <% if(thisComponent.children.length == 0){ %>No Children<% }else{ %>Children:<% }%> &nbsp;&nbsp;
     <div class="btn-group pull-right">
         <button data-toggle="dropdown" class="btn dropdown-toggle" type="button">+ Add Child<span class="caret"></span></button>
         <ul role="menu" class="dropdown-menu">
@@ -25,8 +25,11 @@ Parent: &nbsp;&nbsp;
         </ul>
     </div><br/><br/>
     <% var treeLevel = 0; %>
+    <% var correctBranch = false; %>
     <% _.each(tree, function(level, id){ %>
-        <% if (tree[editingComponent] >= level) return; %>
+        <% if(correctBranch && level <= tree[editingComponent]) correctBranch = false; %>
+        <% if(id == editingComponent) correctBranch = true; %>
+        <% if (!correctBranch || tree[editingComponent] >= level) return; %>
         <% var component = components[id] || stock[id]; %>
         <% treeLevel++; %>
         <div class="assemblerTree" <% if (treeLevel%2 == 0){ %> style="background-color:#ddd"<% } %> ><label style="padding-left:<%= (level-tree[editingComponent]-1)*10 + 20 %>px"><%= component.name %>