diff --git a/src/platform/packages/shared/kbn-dom-drag-drop/src/draggable.tsx b/src/platform/packages/shared/kbn-dom-drag-drop/src/draggable.tsx
index f5edb5176a658..a547ec6c44b98 100644
--- a/src/platform/packages/shared/kbn-dom-drag-drop/src/draggable.tsx
+++ b/src/platform/packages/shared/kbn-dom-drag-drop/src/draggable.tsx
@@ -345,20 +345,7 @@ const DraggableImpl = memo(function DraggableImpl({
     hoveredDropTarget.dropType !== 'reorder';
 
   return (
-    <div
-      className={classNames(className, 'domDraggable', {
-        'domDraggable_active--move': draggedItemProps && dragType === 'move' && !keyboardMode,
-        'domDraggable_dragover_keyboard--move': shouldShowGhostImageInstead,
-        'domDraggable_active--copy': draggedItemProps && dragType === 'copy' && !keyboardMode,
-        'domDraggable_dragover_keyboard--copy':
-          keyboardMode && draggedItemProps && hoveredDropTarget,
-      })}
-      data-test-subj={dataTestSubj || `${dataTestSubjPrefix}_domDraggable_${value.humanData.label}`}
-      draggable
-      onDragEnd={dragEnd}
-      onDragStart={dragStart}
-      onMouseDown={removeSelection}
-    >
+    <>
       <EuiScreenReaderOnly showOnFocus>
         <button
           aria-label={value.humanData.label}
@@ -402,8 +389,25 @@ const DraggableImpl = memo(function DraggableImpl({
           onKeyUp={modifierHandlers.onKeyUp}
         />
       </EuiScreenReaderOnly>
-      {children}
-    </div>
+      <div
+        className={classNames(className, 'domDraggable', {
+          'domDraggable_active--move': draggedItemProps && dragType === 'move' && !keyboardMode,
+          'domDraggable_dragover_keyboard--move': shouldShowGhostImageInstead,
+          'domDraggable_active--copy': draggedItemProps && dragType === 'copy' && !keyboardMode,
+          'domDraggable_dragover_keyboard--copy':
+            keyboardMode && draggedItemProps && hoveredDropTarget,
+        })}
+        data-test-subj={
+          dataTestSubj || `${dataTestSubjPrefix}_domDraggable_${value.humanData.label}`
+        }
+        draggable
+        onDragEnd={dragEnd}
+        onDragStart={dragStart}
+        onMouseDown={removeSelection}
+      >
+        {children}
+      </div>
+    </>
   );
 });
 
diff --git a/test/functional/page_objects/discover_page.ts b/test/functional/page_objects/discover_page.ts
index f10db871ea6eb..7b0898cb4145a 100644
--- a/test/functional/page_objects/discover_page.ts
+++ b/test/functional/page_objects/discover_page.ts
@@ -740,7 +740,7 @@ export class DiscoverPageObject extends FtrService {
    * */
   public async dragFieldWithKeyboardToTable(fieldName: string) {
     const field = await this.find.byCssSelector(
-      `[data-test-subj="dscFieldListPanelField-${fieldName}"] [data-test-subj="domDragDrop-keyboardHandler"]`
+      `[data-attr-field="${fieldName}"] [data-test-subj="domDragDrop-keyboardHandler"]`
     );
     await field.focus();
     await this.retry.try(async () => {