diff --git a/module/doc/js/tablecontents.js b/module/doc/js/tablecontents.js
index 310ebad8d8..46de6e0dd5 100644
--- a/module/doc/js/tablecontents.js
+++ b/module/doc/js/tablecontents.js
@@ -219,13 +219,14 @@ $(function()
             }).show();
         }
         if(item.type !== 'add') return;
-        var $item = $(this);
-        var $input = '';
+        var $item             = $(this);
+        var $input            = '';
+        moduleData.createType = 'child';
+        moduleData.parentID   = 0;
+        moduleData.isUpdate   = false;
         switch(item.method)
         {
             case 'addCataLib' :
-                moduleData.createType = 'child';
-                moduleData.parentID = 0;
                 if(item.hasChildren)
                 {
                     var $rootDom = $('[data-id=' + item.libid + ']a').parent().find('ul');
@@ -236,19 +237,34 @@ $(function()
                     var $rootDom = $('[data-id=' + item.libid + ']a').parent();
                     $rootDom.addClass('open in has-list');
                     $input += $('[data-id=ulTreeModal]').html();
+                    moduleData.isUpdate = true;
                 }
-                $rootDom.prepend($input);
+                $rootDom.append($input);
                 $rootDom.find('input').focus();
                 break;
             case 'addCataBro' :
                 moduleData.createType = 'same';
-                moduleData.parentID = 0;
                 $input += $('[data-id=liTreeModal]').html();
-                var $rootDom = $('#fileTree [data-id=' + item.id + ']li').closest('ul');
-                $rootDom.prepend($input);
+                var $rootDom = $('#fileTree [data-id=' + item.id + ']li');
+                $rootDom.after($input);
                 $rootDom.find('input').focus();
                 break;
             case 'addCataChild' :
+                moduleData.parentID   = item.id;
+                if(item.hasChildren)
+                {
+                    $input += $('[data-id=liTreeModal]').html();
+                    var $rootDom = $('#fileTree [data-id=' + item.id + ']li').find('ul');
+                }
+                else
+                {
+                    var $rootDom = $('#fileTree [data-id=' + item.id + ']li');
+                    $rootDom.addClass('open in has-list');
+                    $input += $('[data-id=ulTreeModal]').html();
+                    moduleData.isUpdate = true;
+                }
+                $rootDom.append($input);
+                $rootDom.find('input').focus();
                 break;
         }
     }).on('blur', '.file-tree input.input-tree', function()
@@ -279,7 +295,7 @@ $(function()
                 return false;
             }
             var module = result.module;
-            var resultDom = $('[data-id=aTreeModal]').html().replace(/%name%/g, module.name).replace(/%id%/g, module.id)
+            var resultDom = $('[data-id=aTreeModal]').html().replace(/%name%/g, module.name).replace(/%id%/g, module.id).replace('insert', module.id);
             $this.parent().append(resultDom);
             $this.remove();
         });
diff --git a/module/doc/view/tablecontents.html.php b/module/doc/view/tablecontents.html.php
index 744db135b0..252e6a811a 100644
--- a/module/doc/view/tablecontents.html.php
+++ b/module/doc/view/tablecontents.html.php
@@ -119,7 +119,7 @@
   <div class='moduleDorpdown'>
     <?php if(common::hasPriv('tree', 'browse')):?>
     <li data-method="addCataBro" data-type="add" data-id="%moduleID%"><a><i class="icon icon-controls"></i><?php echo $lang->doc->libDropdown['addSameModule'];?></a></li>
-    <li data-method="addCataChild" data-type="add" data-id="%moduleID%"><a><i class="icon icon-edit"></i><?php echo $lang->doc->libDropdown['addSubModule'];?></a></li>
+    <li data-method="addCataChild" data-type="add" data-id="%moduleID%" data-has-children='%hasChildren%'><a><i class="icon icon-edit"></i><?php echo $lang->doc->libDropdown['addSubModule'];?></a></li>
     <li data-method="editCata" class='edit-module'><a data-href='<?php echo helper::createLink('tree', 'edit', 'moduleID=%moduleID%&type=doc');?>'><i class="icon icon-edit"></i><?php echo $lang->doc->libDropdown['editModule'];?></a></li>
     <li data-method="deleteCata"><a href='<?php echo helper::createLink('tree', 'delete', 'rootID=%libID%&moduleID=%moduleID%');?>' target='hiddenwin'><i class="icon icon-trash"></i><?php echo $lang->doc->libDropdown['delModule'];?></a></li>
     <?php endif;?>