diff --git a/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/lens_saved_objects_modal.tsx b/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/lens_saved_objects_modal.tsx
deleted file mode 100644
index 1fa23c01d68f5..0000000000000
--- a/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/lens_saved_objects_modal.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import {
-  EuiModal,
-  EuiModalProps,
-  EuiModalBody,
-  EuiModalHeader,
-  EuiModalHeaderTitle,
-} from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n/react';
-import React, { useMemo } from 'react';
-
-import {
-  SavedObjectFinderUi,
-  SavedObjectFinderUiProps,
-} from '../../../../../../../../src/plugins/saved_objects/public';
-import { useKibana } from '../../../../common/lib/kibana';
-import { ModalContainer } from './modal_container';
-
-interface LensSavedObjectsModalProps {
-  onClose: EuiModalProps['onClose'];
-  onChoose: SavedObjectFinderUiProps['onChoose'];
-}
-
-const LensSavedObjectsModalComponent: React.FC<LensSavedObjectsModalProps> = ({
-  onClose,
-  onChoose,
-}) => {
-  const { savedObjects, uiSettings } = useKibana().services;
-
-  const savedObjectMetaData = useMemo(
-    () => [
-      {
-        type: 'lens',
-        getIconForSavedObject: () => 'lensApp',
-        name: i18n.translate(
-          'xpack.cases.markdownEditor.plugins.lens.insertLensSavedObjectModal.searchSelection.savedObjectType.lens',
-          {
-            defaultMessage: 'Lens',
-          }
-        ),
-        includeFields: ['*'],
-      },
-    ],
-    []
-  );
-
-  return (
-    <EuiModal onClose={onClose}>
-      <ModalContainer>
-        <EuiModalHeader>
-          <EuiModalHeaderTitle>
-            <h1>
-              <FormattedMessage
-                id="xpack.cases.markdownEditor.plugins.lens.insertLensSavedObjectModal.modalTitle"
-                defaultMessage="Add from library"
-              />
-            </h1>
-          </EuiModalHeaderTitle>
-        </EuiModalHeader>
-
-        <EuiModalBody>
-          <SavedObjectFinderUi
-            key="searchSavedObjectFinder"
-            onChoose={onChoose}
-            showFilter
-            noItemsMessage={
-              <FormattedMessage
-                id="xpack.cases.markdownEditor.plugins.lens.insertLensSavedObjectModal.searchSelection.notFoundLabel"
-                defaultMessage="'No matching lens found."
-              />
-            }
-            savedObjectMetaData={savedObjectMetaData}
-            fixedPageSize={10}
-            uiSettings={uiSettings}
-            savedObjects={savedObjects}
-          />
-        </EuiModalBody>
-      </ModalContainer>
-    </EuiModal>
-  );
-};
-
-export const LensSavedObjectsModal = React.memo(LensSavedObjectsModalComponent);
diff --git a/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/plugin.tsx b/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/plugin.tsx
index 270489be2d0ab..d9451a3a37829 100644
--- a/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/plugin.tsx
+++ b/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/plugin.tsx
@@ -22,23 +22,36 @@ import {
   EuiFlexGroup,
   EuiFormRow,
   EuiMarkdownAstNodePosition,
+  EuiBetaBadge,
 } from '@elastic/eui';
-import React, { useCallback, useContext, useMemo, useEffect, useState } from 'react';
+import React, { ReactNode, useCallback, useContext, useMemo, useEffect, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { useLocation } from 'react-router-dom';
+import styled from 'styled-components';
 
 import type { TypedLensByValueInput } from '../../../../../../lens/public';
 import { useKibana } from '../../../../common/lib/kibana';
 import { LensMarkDownRenderer } from './processor';
 import { DRAFT_COMMENT_STORAGE_ID, ID } from './constants';
 import { CommentEditorContext } from '../../context';
-import { LensSavedObjectsModal } from './lens_saved_objects_modal';
 import { ModalContainer } from './modal_container';
 import type {
   EmbeddablePackageState,
   EmbeddableInput,
 } from '../../../../../../../../src/plugins/embeddable/public';
+import {
+  SavedObjectFinderUi,
+  SavedObjectFinderUiProps,
+} from '../../../../../../../../src/plugins/saved_objects/public';
+
+const BetaBadgeWrapper = styled.span`
+  display: inline-flex;
+
+  .euiToolTipAnchor {
+    display: inline-flex;
+  }
+`;
 
 type LensIncomingEmbeddablePackage = Omit<EmbeddablePackageState, 'input'> & {
   input: Omit<EmbeddableInput, 'id'> & {
@@ -56,6 +69,56 @@ type LensEuiMarkdownEditorUiPlugin = EuiMarkdownEditorUiPlugin<{
   attributes: TypedLensByValueInput['attributes'];
 }>;
 
+interface LensSavedObjectsPickerProps {
+  children: ReactNode;
+  onChoose: SavedObjectFinderUiProps['onChoose'];
+}
+
+const LensSavedObjectsPickerComponent: React.FC<LensSavedObjectsPickerProps> = ({
+  children,
+  onChoose,
+}) => {
+  const { savedObjects, uiSettings } = useKibana().services;
+
+  const savedObjectMetaData = useMemo(
+    () => [
+      {
+        type: 'lens',
+        getIconForSavedObject: () => 'lensApp',
+        name: i18n.translate(
+          'xpack.cases.markdownEditor.plugins.lens.insertLensSavedObjectModal.searchSelection.savedObjectType.lens',
+          {
+            defaultMessage: 'Lens',
+          }
+        ),
+        includeFields: ['*'],
+      },
+    ],
+    []
+  );
+
+  return (
+    <SavedObjectFinderUi
+      key="searchSavedObjectFinder"
+      onChoose={onChoose}
+      showFilter={false}
+      noItemsMessage={
+        <FormattedMessage
+          id="xpack.cases.markdownEditor.plugins.lens.insertLensSavedObjectModal.searchSelection.notFoundLabel"
+          defaultMessage="No matching lens found."
+        />
+      }
+      savedObjectMetaData={savedObjectMetaData}
+      fixedPageSize={10}
+      uiSettings={uiSettings}
+      savedObjects={savedObjects}
+      children={children}
+    />
+  );
+};
+
+export const LensSavedObjectsPicker = React.memo(LensSavedObjectsPickerComponent);
+
 const LensEditorComponent: LensEuiMarkdownEditorUiPlugin['editor'] = ({
   node,
   onCancel,
@@ -73,7 +136,6 @@ const LensEditorComponent: LensEuiMarkdownEditorUiPlugin['editor'] = ({
       },
     },
   } = useKibana().services;
-
   const [currentAppId, setCurrentAppId] = useState<string | undefined>(undefined);
 
   const [editMode, setEditMode] = useState(!!node);
@@ -87,7 +149,6 @@ const LensEditorComponent: LensEuiMarkdownEditorUiPlugin['editor'] = ({
       mode: 'relative',
     }
   );
-  const [showLensSavedObjectsModal, setShowLensSavedObjectsModal] = useState(false);
   const commentEditorContext = useContext(CommentEditorContext);
   const markdownContext = useContext(EuiMarkdownContext);
 
@@ -221,8 +282,6 @@ const LensEditorComponent: LensEuiMarkdownEditorUiPlugin['editor'] = ({
     [handleEditInLensClick]
   );
 
-  const handleCloseLensSOModal = useCallback(() => setShowLensSavedObjectsModal(false), []);
-
   useEffect(() => {
     if (node?.attributes) {
       setLensEmbeddableAttributes(node.attributes);
@@ -272,58 +331,50 @@ const LensEditorComponent: LensEuiMarkdownEditorUiPlugin['editor'] = ({
   }, [embeddable, storage, timefilter, currentAppId]);
 
   return (
-    <>
-      <ModalContainer>
-        <EuiModalHeader>
-          <EuiModalHeaderTitle>
-            {editMode ? (
-              <FormattedMessage
-                id="xpack.cases.markdownEditor.plugins.lens.editVisualizationModalTitle"
-                defaultMessage="Edit visualization"
-              />
-            ) : (
-              <FormattedMessage
-                id="xpack.cases.markdownEditor.plugins.lens.addVisualizationModalTitle"
-                defaultMessage="Add visualization"
-              />
-            )}
-          </EuiModalHeaderTitle>
-        </EuiModalHeader>
-        <EuiModalBody>
-          <EuiFlexGroup>
-            <EuiFlexItem>
-              <EuiButton
-                onClick={() => handleEditInLensClick()}
-                color="primary"
-                size="m"
-                iconType="lensApp"
-                fill
-              >
+    <ModalContainer>
+      <EuiModalHeader>
+        <EuiModalHeaderTitle>
+          <EuiFlexGroup gutterSize="s" alignItems="center">
+            <EuiFlexItem grow={false}>
+              {editMode ? (
                 <FormattedMessage
-                  id="xpack.cases.markdownEditor.plugins.lens.createVisualizationButtonLabel"
-                  defaultMessage="Create visualization"
+                  id="xpack.cases.markdownEditor.plugins.lens.editVisualizationModalTitle"
+                  defaultMessage="Edit visualization"
                 />
-              </EuiButton>
-            </EuiFlexItem>
-            <EuiFlexItem>
-              <EuiButton
-                color="text"
-                size="m"
-                iconType="folderOpen"
-                onClick={() => setShowLensSavedObjectsModal(true)}
-              >
+              ) : (
                 <FormattedMessage
-                  id="xpack.cases.markdownEditor.plugins.lens.addVisualizationFromLibraryButtonLabel"
-                  defaultMessage="Add from library"
+                  id="xpack.cases.markdownEditor.plugins.lens.addVisualizationModalTitle"
+                  defaultMessage="Add visualization"
                 />
-              </EuiButton>
+              )}
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <BetaBadgeWrapper>
+                <EuiBetaBadge
+                  label={i18n.translate('xpack.cases.markdownEditor.plugins.lens.betaLabel', {
+                    defaultMessage: 'Beta',
+                  })}
+                  tooltipContent={i18n.translate(
+                    'xpack.cases.markdownEditor.plugins.lens.betaDescription',
+                    {
+                      defaultMessage:
+                        'Cases Lens plugin is not GA. Please help us by reporting any bugs.',
+                    }
+                  )}
+                />
+              </BetaBadgeWrapper>
             </EuiFlexItem>
           </EuiFlexGroup>
-          {lensEmbeddableAttributes ? (
+        </EuiModalHeaderTitle>
+      </EuiModalHeader>
+      <EuiModalBody>
+        {lensEmbeddableAttributes ? (
+          <>
             <EuiFlexGroup justifyContent="flexEnd" alignItems="flexEnd">
               <EuiFlexItem>
-                <EuiFormRow label="Title">
+                <EuiFormRow fullWidth label="Title">
                   <EuiFieldText
+                    fullWidth
                     placeholder={i18n.translate(
                       'xpack.cases.markdownEditor.plugins.lens.visualizationTitleFieldPlaceholder',
                       {
@@ -335,63 +386,75 @@ const LensEditorComponent: LensEuiMarkdownEditorUiPlugin['editor'] = ({
                   />
                 </EuiFormRow>
               </EuiFlexItem>
-              <EuiFlexItem>
-                <span>
-                  <EuiButton
-                    iconType="lensApp"
-                    fullWidth={false}
-                    isDisabled={!lens?.canUseEditor() || lensEmbeddableAttributes === null}
-                    onClick={() => handleEditInLensClick()}
-                  >
-                    <FormattedMessage
-                      id="xpack.cases.markdownEditor.plugins.lens.editVisualizationInLensButtonLabel"
-                      defaultMessage="Edit visualization"
-                    />
-                  </EuiButton>
-                </span>
+              <EuiFlexItem grow={false}>
+                <EuiButton
+                  iconType="lensApp"
+                  fullWidth={false}
+                  isDisabled={!lens?.canUseEditor()}
+                  onClick={() => handleEditInLensClick()}
+                >
+                  <FormattedMessage
+                    id="xpack.cases.markdownEditor.plugins.lens.editVisualizationInLensButtonLabel"
+                    defaultMessage="Edit visualization"
+                  />
+                </EuiButton>
               </EuiFlexItem>
             </EuiFlexGroup>
-          ) : null}
-          <EuiSpacer />
-          <LensMarkDownRenderer
-            attributes={lensEmbeddableAttributes}
-            timeRange={timeRange}
-            viewMode={false}
-          />
-        </EuiModalBody>
-        <EuiModalFooter>
-          <EuiButtonEmpty onClick={onCancel}>{'Cancel'}</EuiButtonEmpty>
-          {editMode ? (
-            <EuiButton onClick={handleDelete} color="danger" disabled={!lensEmbeddableAttributes}>
-              <FormattedMessage
-                id="xpack.cases.markdownEditor.plugins.lens.deleteVisualizationButtonLabel"
-                defaultMessage="Delete"
-              />
-            </EuiButton>
-          ) : null}
-          <EuiButton
-            onClick={handleAdd}
-            fill
-            disabled={!lensEmbeddableAttributes || !lensEmbeddableAttributes?.title?.length}
-          >
-            {editMode ? (
-              <FormattedMessage
-                id="xpack.cases.markdownEditor.plugins.lens.updateVisualizationButtonLabel"
-                defaultMessage="Update"
-              />
-            ) : (
-              <FormattedMessage
-                id="xpack.cases.markdownEditor.plugins.lens.addVisualizationToCaseButtonLabel"
-                defaultMessage="Add to a Case"
-              />
-            )}
+            <EuiSpacer />
+            <LensMarkDownRenderer
+              attributes={lensEmbeddableAttributes}
+              timeRange={timeRange}
+              viewMode={false}
+            />
+          </>
+        ) : (
+          <LensSavedObjectsPicker onChoose={handleChooseLensSO}>
+            <EuiFlexItem>
+              <EuiButton
+                onClick={() => handleEditInLensClick()}
+                color="primary"
+                size="m"
+                iconType="lensApp"
+                fill
+              >
+                <FormattedMessage
+                  id="xpack.cases.markdownEditor.plugins.lens.createVisualizationButtonLabel"
+                  defaultMessage="Create visualization"
+                />
+              </EuiButton>
+            </EuiFlexItem>
+          </LensSavedObjectsPicker>
+        )}
+      </EuiModalBody>
+      <EuiModalFooter>
+        <EuiButtonEmpty onClick={onCancel}>{'Cancel'}</EuiButtonEmpty>
+        {editMode ? (
+          <EuiButton onClick={handleDelete} color="danger" disabled={!lensEmbeddableAttributes}>
+            <FormattedMessage
+              id="xpack.cases.markdownEditor.plugins.lens.deleteVisualizationButtonLabel"
+              defaultMessage="Delete"
+            />
           </EuiButton>
-        </EuiModalFooter>
-      </ModalContainer>
-      {showLensSavedObjectsModal ? (
-        <LensSavedObjectsModal onClose={handleCloseLensSOModal} onChoose={handleChooseLensSO} />
-      ) : null}
-    </>
+        ) : null}
+        <EuiButton
+          onClick={handleAdd}
+          fill
+          disabled={!lensEmbeddableAttributes || !lensEmbeddableAttributes?.title?.length}
+        >
+          {editMode ? (
+            <FormattedMessage
+              id="xpack.cases.markdownEditor.plugins.lens.updateVisualizationButtonLabel"
+              defaultMessage="Update"
+            />
+          ) : (
+            <FormattedMessage
+              id="xpack.cases.markdownEditor.plugins.lens.addVisualizationToCaseButtonLabel"
+              defaultMessage="Add to a Case"
+            />
+          )}
+        </EuiButton>
+      </EuiModalFooter>
+    </ModalContainer>
   );
 };