diff --git a/public/src/admin/manage/categories.js b/public/src/admin/manage/categories.js
index 83f88898c0..ca974bbdbe 100644
--- a/public/src/admin/manage/categories.js
+++ b/public/src/admin/manage/categories.js
@@ -202,7 +202,7 @@ define('admin/manage/categories', [
 			// this makes sure order is correct when drag & drop is used on pages > 1
 			const baseIndex = (ajaxify.data.pagination.currentPage - 1) * ajaxify.data.categoriesPerPage;
 			modified[cid] = {
-				order: baseIndex + e.newIndex + 1,
+				order: baseIndex + e.newIndex,
 			};
 
 			if (isCategoryUpdate) {
@@ -263,7 +263,11 @@ define('admin/manage/categories', [
 				categories: categories,
 				parentCategory: parentCategory,
 			}, function (html) {
-				container.append(html);
+				if (container.find('.category-row').length) {
+					container.find('.category-row').after(html);
+				} else {
+					container.append(html);
+				}
 
 				// Disable expand toggle
 				if (!categories.length) {
diff --git a/src/views/admin/partials/categories/category-rows.tpl b/src/views/admin/partials/categories/category-rows.tpl
index 4f4becf95c..4a1e964a81 100644
--- a/src/views/admin/partials/categories/category-rows.tpl
+++ b/src/views/admin/partials/categories/category-rows.tpl
@@ -44,11 +44,12 @@
                 </div>
             </div>
         </div>
+
+        <ul class="list-unstyled has-more-categories {{{ if !../hasMoreSubCategories}}}hidden{{{ end }}}">
+            <li>
+                <a href="{config.relative_path}/admin/manage/categories?cid={categories.cid}&page={categories.showMorePage}" class="btn btn-outline-secondary">[[category:x-more-categories, {../subCategoriesLeft}]]</a>
+            </li>
+        </ul>
     </li>
-    {{{ if ../hasMoreSubCategories}}}
-    <li>
-	    <a href="{config.relative_path}/admin/manage/categories?cid={categories.cid}&page={categories.showMorePage}" class="btn btn-outline-secondary">[[category:x-more-categories, {../subCategoriesLeft}]]</a>
-    </li>
-	{{{ end }}}
 {{{ end }}}
 </ul>