diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch/chart_option_append.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch/chart_option_append.tsx
index af2e43f8d6d26..09ec24c5b847f 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch/chart_option_append.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch/chart_option_append.tsx
@@ -7,7 +7,7 @@
 
 import './chart_switch.scss';
 import React, { ReactNode } from 'react';
-import { EuiFlexItem, EuiIconTip, EuiBetaBadge, EuiFlexGroup } from '@elastic/eui';
+import { EuiFlexItem, EuiIconTip, EuiBetaBadge, EuiFlexGroup, EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { css } from '@emotion/react';
 
@@ -55,16 +55,22 @@ const DataLossWarning = ({ content, id }: { content: ReactNode; id: string }) =>
 export const ExperimentalBadge = () => {
   return (
     <EuiFlexItem grow={false}>
-      <EuiBetaBadge
-        css={css`
-          vertical-align: middle;
-        `}
-        iconType="beaker"
-        label={i18n.translate('xpack.lens.chartSwitch.experimentalLabel', {
+      <EuiToolTip
+        content={i18n.translate('xpack.lens.chartSwitch.experimentalLabel', {
           defaultMessage: 'Technical preview',
         })}
-        size="s"
-      />
+      >
+        <EuiBetaBadge
+          css={css`
+            vertical-align: middle;
+          `}
+          iconType="beaker"
+          label={i18n.translate('xpack.lens.chartSwitch.experimentalLabel', {
+            defaultMessage: 'Technical preview',
+          })}
+          size="s"
+        />
+      </EuiToolTip>
     </EuiFlexItem>
   );
 };
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch/chart_switch.scss b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch/chart_switch.scss
index 61e8a7b9e172e..5f51380e06154 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch/chart_switch.scss
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch/chart_switch.scss
@@ -20,16 +20,16 @@
   }
 }
 
-.lnsChartSwitch__append {
-  display: inline-flex;
-}
-
 .lnsChartSwitch__option {
   .euiSelectableListItem__text {
     flex-grow: 0;
   }
   .euiSelectableListItem__append {
     margin-left: $euiSizeXS;
+    display: flex;
+    flex-grow: 1;
+    align-items: center;
+    justify-content: flex-end;
   }
 }