diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 49d4b9c6a..95e7b71a0 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -20,7 +20,7 @@ Changelog
  * Add StreamFieldPanel to available panel types in documentation (Dan Swain)
  * Add {{ block.super }} example to ModelAdmin customisation in documentation (Dan Swain)
  * Add ability to filter image index by a tag (Benedikt Willi)
- * Add formal support for nested InlinePanels (Matt Westcott)
+ * Add formal support for nested InlinePanels (Matt Westcott, Sam Costigan, Andy Chosak, Scott Cranfill)
  * Added cache control headers when serving documents (Johannes Vogel)
  * Use `sensitive_post_parameters` on password reset form (Dan Braghis)
  * Fix: Rename documents listing column 'uploaded' to 'created' (LB (Ben Johnston))
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 09386660f..9f583c159 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -427,6 +427,7 @@ Contributors
 * Pete Andrew
 * Benedikt Willi
 * Johannes Vogel
+* Sam Costigan
 
 Translators
 ===========
diff --git a/docs/releases/2.8.rst b/docs/releases/2.8.rst
index bb1c3f5c8..aa98fbcd1 100644
--- a/docs/releases/2.8.rst
+++ b/docs/releases/2.8.rst
@@ -40,7 +40,7 @@ Other features
  * Add StreamFieldPanel to available panel types in documentation (Dan Swain)
  * Add {{ block.super }} example to ModelAdmin customisation in documentation (Dan Swain)
  * Add ability to filter image index by a tag (Benedikt Willi)
- * Add formal support for nested InlinePanels (Matt Westcott)
+ * Add formal support for nested InlinePanels (Matt Westcott, Sam Costigan, Andy Chosak, Scott Cranfill)
  * Added cache control headers when serving documents (Johannes Vogel)
  * Use ``sensitive_post_parameters`` on password reset form (Dan Braghis)
 
diff --git a/wagtail/admin/static_src/wagtailadmin/js/page-editor.js b/wagtail/admin/static_src/wagtailadmin/js/page-editor.js
index d624dc4dd..7c2218b58 100644
--- a/wagtail/admin/static_src/wagtailadmin/js/page-editor.js
+++ b/wagtail/admin/static_src/wagtailadmin/js/page-editor.js
@@ -38,13 +38,13 @@ function InlinePanel(opts) {
         if (opts.canOrder) {
             $('#' + prefix + '-move-up').on('click', function() {
                 var currentChild = $('#' + childId);
-                var currentChildOrderElem = currentChild.find('input[name$="-ORDER"]');
+                var currentChildOrderElem = currentChild.children('input[name$="-ORDER"]');
                 var currentChildOrder = currentChildOrderElem.val();
 
                 /* find the previous visible 'inline_child' li before this one */
                 var prevChild = currentChild.prevAll(':not(.deleted)').first();
                 if (!prevChild.length) return;
-                var prevChildOrderElem = prevChild.find('input[name$="-ORDER"]');
+                var prevChildOrderElem = prevChild.children('input[name$="-ORDER"]');
                 var prevChildOrder = prevChildOrderElem.val();
 
                 // async swap animation must run before the insertBefore line below, but doesn't need to finish first
@@ -59,13 +59,13 @@ function InlinePanel(opts) {
 
             $('#' + prefix + '-move-down').on('click', function() {
                 var currentChild = $('#' + childId);
-                var currentChildOrderElem = currentChild.find('input[name$="-ORDER"]');
+                var currentChildOrderElem = currentChild.children('input[name$="-ORDER"]');
                 var currentChildOrder = currentChildOrderElem.val();
 
                 /* find the next visible 'inline_child' li after this one */
                 var nextChild = currentChild.nextAll(':not(.deleted)').first();
                 if (!nextChild.length) return;
-                var nextChildOrderElem = nextChild.find('input[name$="-ORDER"]');
+                var nextChildOrderElem = nextChild.children('input[name$="-ORDER"]');
                 var nextChildOrder = nextChildOrderElem.val();
 
                 // async swap animation must run before the insertAfter line below, but doesn't need to finish first