diff --git a/x-pack/plugins/ml/public/application/components/job_selector/job_selector.tsx b/x-pack/plugins/ml/public/application/components/job_selector/job_selector.tsx
index d25d2c3a858ed..76e62160ca8cd 100644
--- a/x-pack/plugins/ml/public/application/components/job_selector/job_selector.tsx
+++ b/x-pack/plugins/ml/public/application/components/job_selector/job_selector.tsx
@@ -165,7 +165,11 @@ export function JobSelector({ dateFormatTz, singleSelection, timeseriesOnly }: J
   function renderFlyout() {
     if (isFlyoutVisible) {
       return (
-        <EuiFlyout onClose={closeFlyout}>
+        <EuiFlyout
+          onClose={closeFlyout}
+          data-test-subj="mlFlyoutJobSelector"
+          aria-labelledby="jobSelectorFlyout"
+        >
           <JobSelectorFlyoutContent
             dateFormatTz={dateFormatTz}
             timeseriesOnly={timeseriesOnly}
diff --git a/x-pack/plugins/ml/public/application/components/job_selector/job_selector_flyout.tsx b/x-pack/plugins/ml/public/application/components/job_selector/job_selector_flyout.tsx
index a90eb8cfde532..48246c114a8d0 100644
--- a/x-pack/plugins/ml/public/application/components/job_selector/job_selector_flyout.tsx
+++ b/x-pack/plugins/ml/public/application/components/job_selector/job_selector_flyout.tsx
@@ -176,120 +176,124 @@ export const JobSelectorFlyoutContent: FC<JobSelectorFlyoutProps> = ({
   }
 
   return (
-    <EuiResizeObserver onResize={handleResize}>
-      {(resizeRef) => (
-        <EuiFlexGroup
-          direction="column"
-          gutterSize="none"
-          ref={(e) => {
-            flyoutEl.current = e;
-            resizeRef(e);
-          }}
-          aria-labelledby="jobSelectorFlyout"
-          data-test-subj="mlFlyoutJobSelector"
-        >
-          <EuiFlyoutHeader hasBorder>
-            <EuiTitle size="m">
-              <h2 id="flyoutTitle">
-                {i18n.translate('xpack.ml.jobSelector.flyoutTitle', {
-                  defaultMessage: 'Job selection',
-                })}
-              </h2>
-            </EuiTitle>
-          </EuiFlyoutHeader>
-          <EuiFlyoutBody className="mlJobSelectorFlyoutBody">
-            {isLoading ? (
-              <EuiProgress size="xs" color="accent" />
-            ) : (
-              <>
-                <EuiFlexGroup direction="column" responsive={false}>
-                  <EuiFlexItem grow={false}>
-                    <EuiFlexGroup wrap responsive={false} gutterSize="xs" alignItems="center">
-                      <NewSelectionIdBadges
-                        limit={BADGE_LIMIT}
-                        maps={jobGroupsMaps}
-                        newSelection={newSelection}
-                        onDeleteClick={removeId}
-                        onLinkClick={() => setShowAllBadges(!showAllBadges)}
-                        showAllBadges={showAllBadges}
-                      />
-                    </EuiFlexGroup>
-                  </EuiFlexItem>
-                  <EuiFlexItem grow={false}>
-                    <EuiFlexGroup direction="row" justifyContent="spaceBetween" responsive={false}>
-                      <EuiFlexItem grow={false}>
-                        {!singleSelection && newSelection.length > 0 && (
-                          <EuiButtonEmpty
-                            onClick={clearSelection}
-                            size="xs"
-                            data-test-subj="mlFlyoutJobSelectorButtonClearSelection"
-                          >
-                            {i18n.translate('xpack.ml.jobSelector.clearAllFlyoutButton', {
-                              defaultMessage: 'Clear all',
-                            })}
-                          </EuiButtonEmpty>
-                        )}
-                      </EuiFlexItem>
-                      {withTimeRangeSelector && (
+    <>
+      <EuiFlyoutHeader hasBorder>
+        <EuiTitle size="m">
+          <h2 id="flyoutTitle">
+            {i18n.translate('xpack.ml.jobSelector.flyoutTitle', {
+              defaultMessage: 'Job selection',
+            })}
+          </h2>
+        </EuiTitle>
+      </EuiFlyoutHeader>
+
+      <EuiFlyoutBody className="mlJobSelectorFlyoutBody">
+        <EuiResizeObserver onResize={handleResize}>
+          {(resizeRef) => (
+            <div
+              ref={(e) => {
+                flyoutEl.current = e;
+                resizeRef(e);
+              }}
+            >
+              {isLoading ? (
+                <EuiProgress size="xs" color="accent" />
+              ) : (
+                <>
+                  <EuiFlexGroup direction="column" responsive={false}>
+                    <EuiFlexItem grow={false}>
+                      <EuiFlexGroup wrap responsive={false} gutterSize="xs" alignItems="center">
+                        <NewSelectionIdBadges
+                          limit={BADGE_LIMIT}
+                          maps={jobGroupsMaps}
+                          newSelection={newSelection}
+                          onDeleteClick={removeId}
+                          onLinkClick={() => setShowAllBadges(!showAllBadges)}
+                          showAllBadges={showAllBadges}
+                        />
+                      </EuiFlexGroup>
+                    </EuiFlexItem>
+                    <EuiFlexItem grow={false}>
+                      <EuiFlexGroup
+                        direction="row"
+                        justifyContent="spaceBetween"
+                        responsive={false}
+                      >
                         <EuiFlexItem grow={false}>
-                          <EuiSwitch
-                            label={i18n.translate(
-                              'xpack.ml.jobSelector.applyTimerangeSwitchLabel',
-                              {
-                                defaultMessage: 'Apply time range',
-                              }
-                            )}
-                            checked={applyTimeRange}
-                            onChange={toggleTimerangeSwitch}
-                            data-test-subj="mlFlyoutJobSelectorSwitchApplyTimeRange"
-                          />
+                          {!singleSelection && newSelection.length > 0 && (
+                            <EuiButtonEmpty
+                              onClick={clearSelection}
+                              size="xs"
+                              data-test-subj="mlFlyoutJobSelectorButtonClearSelection"
+                            >
+                              {i18n.translate('xpack.ml.jobSelector.clearAllFlyoutButton', {
+                                defaultMessage: 'Clear all',
+                              })}
+                            </EuiButtonEmpty>
+                          )}
                         </EuiFlexItem>
-                      )}
-                    </EuiFlexGroup>
-                  </EuiFlexItem>
-                </EuiFlexGroup>
-                <JobSelectorTable
-                  jobs={jobs}
-                  ganttBarWidth={ganttBarWidth}
-                  groupsList={groups}
-                  onSelection={handleNewSelection}
-                  selectedIds={newSelection}
-                  singleSelection={singleSelection}
-                  timeseriesOnly={timeseriesOnly}
-                  withTimeRangeSelector={withTimeRangeSelector}
-                />
-              </>
-            )}
-          </EuiFlyoutBody>
-          <EuiFlyoutFooter>
-            <EuiFlexGroup>
-              <EuiFlexItem grow={false}>
-                <EuiButton
-                  onClick={applySelection}
-                  fill
-                  isDisabled={newSelection.length === 0}
-                  data-test-subj="mlFlyoutJobSelectorButtonApply"
-                >
-                  {i18n.translate('xpack.ml.jobSelector.applyFlyoutButton', {
-                    defaultMessage: 'Apply',
-                  })}
-                </EuiButton>
-              </EuiFlexItem>
-              <EuiFlexItem grow={false}>
-                <EuiButtonEmpty
-                  iconType="cross"
-                  onClick={onFlyoutClose}
-                  data-test-subj="mlFlyoutJobSelectorButtonClose"
-                >
-                  {i18n.translate('xpack.ml.jobSelector.closeFlyoutButton', {
-                    defaultMessage: 'Close',
-                  })}
-                </EuiButtonEmpty>
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          </EuiFlyoutFooter>
+                        {withTimeRangeSelector && (
+                          <EuiFlexItem grow={false}>
+                            <EuiSwitch
+                              label={i18n.translate(
+                                'xpack.ml.jobSelector.applyTimerangeSwitchLabel',
+                                {
+                                  defaultMessage: 'Apply time range',
+                                }
+                              )}
+                              checked={applyTimeRange}
+                              onChange={toggleTimerangeSwitch}
+                              data-test-subj="mlFlyoutJobSelectorSwitchApplyTimeRange"
+                            />
+                          </EuiFlexItem>
+                        )}
+                      </EuiFlexGroup>
+                    </EuiFlexItem>
+                  </EuiFlexGroup>
+                  <JobSelectorTable
+                    jobs={jobs}
+                    ganttBarWidth={ganttBarWidth}
+                    groupsList={groups}
+                    onSelection={handleNewSelection}
+                    selectedIds={newSelection}
+                    singleSelection={singleSelection}
+                    timeseriesOnly={timeseriesOnly}
+                    withTimeRangeSelector={withTimeRangeSelector}
+                  />
+                </>
+              )}
+            </div>
+          )}
+        </EuiResizeObserver>
+      </EuiFlyoutBody>
+
+      <EuiFlyoutFooter>
+        <EuiFlexGroup>
+          <EuiFlexItem grow={false}>
+            <EuiButton
+              onClick={applySelection}
+              fill
+              isDisabled={newSelection.length === 0}
+              data-test-subj="mlFlyoutJobSelectorButtonApply"
+            >
+              {i18n.translate('xpack.ml.jobSelector.applyFlyoutButton', {
+                defaultMessage: 'Apply',
+              })}
+            </EuiButton>
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <EuiButtonEmpty
+              iconType="cross"
+              onClick={onFlyoutClose}
+              data-test-subj="mlFlyoutJobSelectorButtonClose"
+            >
+              {i18n.translate('xpack.ml.jobSelector.closeFlyoutButton', {
+                defaultMessage: 'Close',
+              })}
+            </EuiButtonEmpty>
+          </EuiFlexItem>
         </EuiFlexGroup>
-      )}
-    </EuiResizeObserver>
+      </EuiFlyoutFooter>
+    </>
   );
 };
diff --git a/x-pack/plugins/ml/public/application/explorer/swimlane_container.tsx b/x-pack/plugins/ml/public/application/explorer/swimlane_container.tsx
index 9d6d6c14ed659..9c7d0f6fe78e2 100644
--- a/x-pack/plugins/ml/public/application/explorer/swimlane_container.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/swimlane_container.tsx
@@ -213,7 +213,8 @@ export const SwimlaneContainer: FC<SwimlaneProps> = ({
     // Persists container height during loading to prevent page from jumping
     return isLoading
       ? containerHeightRef.current
-      : rowsCount * CELL_HEIGHT + LEGEND_HEIGHT + (showTimeline ? Y_AXIS_HEIGHT : 0);
+      : // TODO update when elastic charts X label will be fixed
+        rowsCount * CELL_HEIGHT + LEGEND_HEIGHT + (true ? Y_AXIS_HEIGHT : 0);
   }, [isLoading, rowsCount, showTimeline]);
 
   useEffect(() => {
@@ -282,7 +283,7 @@ export const SwimlaneContainer: FC<SwimlaneProps> = ({
         },
       },
       xAxisLabel: {
-        visible: showTimeline,
+        visible: true,
         // eui color subdued
         fill: `#98A2B3`,
         formatter: (v: number) => {
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_setup_flyout.tsx b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_setup_flyout.tsx
index 8e591d8bdbcb2..3f58449f81a9a 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_setup_flyout.tsx
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_setup_flyout.tsx
@@ -94,8 +94,9 @@ export async function resolveAnomalySwimlaneUserInput(
         </KibanaContextProvider>
       ),
       {
-        'data-test-subj': 'mlAnomalySwimlaneEmbeddable',
+        'data-test-subj': 'mlFlyoutJobSelector',
         ownFocus: true,
+        closeButtonAriaLabel: 'jobSelectorFlyout',
       }
     );