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 803281bcd0ce9..62a74ed142ccf 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
@@ -193,7 +193,6 @@ export const JobSelectorFlyout: FC<JobSelectorFlyoutProps> = ({
       ref={flyoutEl}
       onClose={onFlyoutClose}
       aria-labelledby="jobSelectorFlyout"
-      size="l"
       data-test-subj="mlFlyoutJobSelector"
     >
       <EuiFlyoutHeader hasBorder>
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_initializer.tsx b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_initializer.tsx
index be9a332e51dbc..51b3f5864628c 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_initializer.tsx
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_initializer.tsx
@@ -17,6 +17,7 @@ import {
   EuiModalHeaderTitle,
   EuiSelect,
   EuiFieldText,
+  EuiModal,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
@@ -33,7 +34,6 @@ export interface AnomalySwimlaneInitializerProps {
     panelTitle: string;
     swimlaneType: SwimlaneType;
     viewBy?: string;
-    limit?: number;
   }) => void;
   onCancel: () => void;
 }
@@ -81,7 +81,7 @@ export const AnomalySwimlaneInitializer: FC<AnomalySwimlaneInitializerProps> = (
       (swimlaneType === SWIMLANE_TYPE.VIEW_BY && !!viewBySwimlaneFieldName));
 
   return (
-    <div>
+    <EuiModal initialFocus="[name=panelTitle]">
       <EuiModalHeader>
         <EuiModalHeaderTitle>
           <FormattedMessage
@@ -176,6 +176,6 @@ export const AnomalySwimlaneInitializer: FC<AnomalySwimlaneInitializerProps> = (
           />
         </EuiButton>
       </EuiModalFooter>
-    </div>
+    </EuiModal>
   );
 };