diff --git a/module/doc/css/sortlibs.css b/module/doc/css/sortlibs.css
index f835cc6e77..de9080726c 100644
--- a/module/doc/css/sortlibs.css
+++ b/module/doc/css/sortlibs.css
@@ -1,5 +1,5 @@
 #mainContent .doclib-name {font-size: 13px; font-weight: 550; padding: 10px 0px;}
 #mainContent #libs {padding-bottom: 10px;}
 #mainContent #libs .lib {padding-bottom: 5px;}
-#mainContent #libs .lib > .lib-name{cursor: pointer;}
-#mainContent #libs .lib > .icon-move {padding-left: 4px; font-size:13px; vertical-align: text-top; cursor: pointer;}
+#mainContent #libs .lib  .lib-name{cursor: pointer;}
+#mainContent #libs .lib  .icon-move {padding-left: 4px; font-size:13px; vertical-align: text-top; cursor: pointer;}
diff --git a/module/doc/js/sortlibs.js b/module/doc/js/sortlibs.js
index 7e86f69b58..cede49cb80 100644
--- a/module/doc/js/sortlibs.js
+++ b/module/doc/js/sortlibs.js
@@ -9,9 +9,18 @@ $(function()
         nested: true,
         selector: 'div',
         dragCssClass: 'drop-here',
+        canMoveHere: function($ele, $target)
+        {
+            var maxTop = $('#libs .libList').height() - $ele.height();
+            if(parseFloat($('.drag-shadow').css('top')) < 0) $('.drag-shadow').css('top', '0');
+            if(parseFloat($('.drag-shadow').css('left')) != 0) $('.drag-shadow').css('left', '0');
+            if(parseFloat($('.drag-shadow').css('top')) > maxTop) $('.drag-shadow').css('top', maxTop + 'px');
+            if(parseFloat($('.drag-shadow').css('bottom')) > $('#libs').height()) $('.drag-shadow').css('bottom', '0');
+            return true;
+        },
         targetSelector: function($ele, $root)
         {
-            var $libs = $ele.closest('#libs');
+            var $libs = $ele.closest('#libs .libList');
             return $libs.children('div.lib');
         },
         always: function()
@@ -21,7 +30,7 @@ $(function()
         finish: function(e)
         {
             var orders = ',';
-            $('#libs').find('div.lib').each(function()
+            $('#libs .libList').find('div.lib').each(function()
             {
                 orders += $(this).attr('data-id') + ',';
             });
diff --git a/module/doc/view/sortlibs.html.php b/module/doc/view/sortlibs.html.php
index b16f7f59e9..37679a0236 100644
--- a/module/doc/view/sortlibs.html.php
+++ b/module/doc/view/sortlibs.html.php
@@ -19,12 +19,14 @@
     <div class='doclib-name'><?php echo $lang->doclib->name?></div>
     <?php $libIdList = ',';?>
     <form id='libs' class='load-indicator main-form' method='post' target='hiddenwin'>
-      <?php foreach($libs as $libID => $libName):?>
-      <?php $libIdList .= "$libID,";?>
-      <div class='lib' data-id='<?php echo $libID;?>'>
-        <span class='lib-name'><?php echo $libName;?></span><i class='icon-move'></i>
+      <div class='libList'>
+        <?php foreach($libs as $libID => $libName):?>
+        <?php $libIdList .= "$libID,";?>
+        <div class='lib' data-id='<?php echo $libID;?>'>
+          <span class='lib-name'><?php echo $libName;?></span><i class='icon-move'></i>
+        </div>
+        <?php endforeach;?>
       </div>
-      <?php endforeach;?>
       <?php echo html::hidden('libIdList', trim($libIdList, ','));?>
       <div class='text-center'><?php echo html::submitButton($lang->save);?></div>
     </form>