diff --git a/core/misc/tabledrag.es6.js b/core/misc/tabledrag.es6.js
index 9292f5017f..53c352394f 100644
--- a/core/misc/tabledrag.es6.js
+++ b/core/misc/tabledrag.es6.js
@@ -511,10 +511,10 @@
         case 38:
         // Safari up arrow.
         case 63232:
-          var $previousRow = $(self.rowObject.element).prev('tr:first-of-type');
+          var $previousRow = $(self.rowObject.element).prev('tr').eq(0);
           var previousRow = $previousRow.get(0);
           while (previousRow && $previousRow.is(':hidden')) {
-            $previousRow = $(previousRow).prev('tr:first-of-type');
+            $previousRow = $(previousRow).prev('tr').eq(0);
             previousRow = $previousRow.get(0);
           }
           if (previousRow) {
@@ -527,7 +527,7 @@
               // Swap with the previous top-level row.
               groupHeight = 0;
               while (previousRow && $previousRow.find('.js-indentation').length) {
-                $previousRow = $(previousRow).prev('tr:first-of-type');
+                $previousRow = $(previousRow).prev('tr').eq(0);
                 previousRow = $previousRow.get(0);
                 groupHeight += $previousRow.is(':hidden') ? 0 : previousRow.offsetHeight;
               }
@@ -562,10 +562,10 @@
         case 40:
         // Safari down arrow.
         case 63233:
-          var $nextRow = $(self.rowObject.group).eq(-1).next('tr:first-of-type');
+          var $nextRow = $(self.rowObject.group).eq(-1).next('tr').eq(0);
           var nextRow = $nextRow.get(0);
           while (nextRow && $nextRow.is(':hidden')) {
-            $nextRow = $(nextRow).next('tr:first-of-type');
+            $nextRow = $(nextRow).next('tr').eq(0);
             nextRow = $nextRow.get(0);
           }
           if (nextRow) {
diff --git a/core/misc/tabledrag.js b/core/misc/tabledrag.js
index 3155c77e39..fa4f68e8a5 100644
--- a/core/misc/tabledrag.js
+++ b/core/misc/tabledrag.js
@@ -289,10 +289,10 @@
 
         case 38:
         case 63232:
-          var $previousRow = $(self.rowObject.element).prev('tr:first-of-type');
+          var $previousRow = $(self.rowObject.element).prev('tr').eq(0);
           var previousRow = $previousRow.get(0);
           while (previousRow && $previousRow.is(':hidden')) {
-            $previousRow = $(previousRow).prev('tr:first-of-type');
+            $previousRow = $(previousRow).prev('tr').eq(0);
             previousRow = $previousRow.get(0);
           }
           if (previousRow) {
@@ -303,7 +303,7 @@
             if ($(item).is('.tabledrag-root')) {
               groupHeight = 0;
               while (previousRow && $previousRow.find('.js-indentation').length) {
-                $previousRow = $(previousRow).prev('tr:first-of-type');
+                $previousRow = $(previousRow).prev('tr').eq(0);
                 previousRow = $previousRow.get(0);
                 groupHeight += $previousRow.is(':hidden') ? 0 : previousRow.offsetHeight;
               }
@@ -331,10 +331,10 @@
 
         case 40:
         case 63233:
-          var $nextRow = $(self.rowObject.group).eq(-1).next('tr:first-of-type');
+          var $nextRow = $(self.rowObject.group).eq(-1).next('tr').eq(0);
           var nextRow = $nextRow.get(0);
           while (nextRow && $nextRow.is(':hidden')) {
-            $nextRow = $(nextRow).next('tr:first-of-type');
+            $nextRow = $(nextRow).next('tr').eq(0);
             nextRow = $nextRow.get(0);
           }
           if (nextRow) {