diff --git a/src/platform/plugins/shared/controls/public/control_group/components/control_group.tsx b/src/platform/plugins/shared/controls/public/control_group/components/control_group.tsx
index 6453474aa8ff2..e7f75d4b39c11 100644
--- a/src/platform/plugins/shared/controls/public/control_group/components/control_group.tsx
+++ b/src/platform/plugins/shared/controls/public/control_group/components/control_group.tsx
@@ -147,7 +147,13 @@ export function ControlGroup({
             }}
           >
             <SortableContext items={controlsInOrder} strategy={rectSortingStrategy}>
-              <EuiFlexGroup className="controlGroup" alignItems="center" gutterSize="s" wrap={true}>
+              <EuiFlexGroup
+                component="ul"
+                className="controlGroup"
+                alignItems="center"
+                gutterSize="s"
+                wrap={true}
+              >
                 {controlsInOrder.map(({ id, type }) => (
                   <ControlRenderer
                     key={id}
diff --git a/src/platform/plugins/shared/controls/public/control_group/components/control_panel.tsx b/src/platform/plugins/shared/controls/public/control_group/components/control_panel.tsx
index 1259b4a1fca19..13ff5475c2a7f 100644
--- a/src/platform/plugins/shared/controls/public/control_group/components/control_panel.tsx
+++ b/src/platform/plugins/shared/controls/public/control_group/components/control_panel.tsx
@@ -126,6 +126,7 @@ export const ControlPanel = <ApiType extends DefaultControlApi = DefaultControlA
 
   return (
     <EuiFlexItem
+      component="li"
       ref={setNodeRef}
       style={style}
       grow={controlGrow}
diff --git a/src/platform/test/functional/page_objects/dashboard_page_controls.ts b/src/platform/test/functional/page_objects/dashboard_page_controls.ts
index e59610a61a13b..0ede605d85cf2 100644
--- a/src/platform/test/functional/page_objects/dashboard_page_controls.ts
+++ b/src/platform/test/functional/page_objects/dashboard_page_controls.ts
@@ -745,7 +745,7 @@ export class DashboardPageControls extends FtrService {
 
   public async rangeSliderEnsurePopoverIsClosed(controlId: string) {
     this.log.debug(`Closing popover for Range Slider: ${controlId}`);
-    const controlLabel = await this.find.byXPath(`//div[@data-control-id='${controlId}']//label`);
+    const controlLabel = await this.find.byXPath(`//li[@data-control-id='${controlId}']//label`);
     await controlLabel.click();
     await this.testSubjects.waitForDeleted(`rangeSlider__slider`);
   }