diff --git a/x-pack/plugins/lens/public/shared_components/collapse_setting.tsx b/x-pack/plugins/lens/public/shared_components/collapse_setting.tsx
index bbaf5296a4e288..9d855fa2bccfee 100644
--- a/x-pack/plugins/lens/public/shared_components/collapse_setting.tsx
+++ b/x-pack/plugins/lens/public/shared_components/collapse_setting.tsx
@@ -28,6 +28,7 @@ export function CollapseSetting({
   return (
     <>
       <EuiFormRow
+        id="lns-indexPattern-collapse-by"
         label={
           <EuiToolTip
             delay="long"
diff --git a/x-pack/plugins/lens/public/visualizations/metric/dimension_editor.tsx b/x-pack/plugins/lens/public/visualizations/metric/dimension_editor.tsx
index 16d2fa2033fcc8..c84fa45834fa0b 100644
--- a/x-pack/plugins/lens/public/visualizations/metric/dimension_editor.tsx
+++ b/x-pack/plugins/lens/public/visualizations/metric/dimension_editor.tsx
@@ -143,78 +143,77 @@ function SecondaryMetricEditor({ accessor, idPrefix, frame, layerId, setState, s
   const defaultPrefix = columnName || '';
 
   return (
-    <div data-test-subj="lnsMetricDimensionEditor_secondary_metric">
-      <EuiFormRow
-        display="columnCompressed"
-        fullWidth
-        label={i18n.translate('xpack.lens.metric.prefixText.label', {
-          defaultMessage: 'Prefix',
-        })}
-      >
-        <>
-          <EuiButtonGroup
-            isFullWidth
-            buttonSize="compressed"
-            legend={i18n.translate('xpack.lens.metric.prefix.label', {
-              defaultMessage: 'Prefix',
-            })}
-            data-test-subj="lnsMetric_prefix_buttons"
-            options={[
-              {
-                id: `${idPrefix}auto`,
-                label: i18n.translate('xpack.lens.metric.prefix.auto', {
-                  defaultMessage: 'Auto',
-                }),
-                'data-test-subj': 'lnsMetric_prefix_auto',
-                value: undefined,
-              },
-              {
-                id: `${idPrefix}custom`,
-                label: i18n.translate('xpack.lens.metric.prefix.custom', {
-                  defaultMessage: 'Custom',
-                }),
-                'data-test-subj': 'lnsMetric_prefix_custom',
-                value: defaultPrefix,
-              },
-              {
-                id: `${idPrefix}none`,
-                label: i18n.translate('xpack.lens.metric.prefix.none', {
-                  defaultMessage: 'None',
-                }),
-                'data-test-subj': 'lnsMetric_prefix_none',
-                value: '',
-              },
-            ]}
-            idSelected={`${idPrefix}${
-              state.secondaryPrefix === undefined
-                ? 'auto'
-                : state.secondaryPrefix === ''
-                ? 'none'
-                : 'custom'
-            }`}
-            onChange={(_id, secondaryPrefix) => {
+    <EuiFormRow
+      display="columnCompressed"
+      fullWidth
+      label={i18n.translate('xpack.lens.metric.prefixText.label', {
+        defaultMessage: 'Prefix',
+      })}
+    >
+      <>
+        <EuiButtonGroup
+          isFullWidth
+          buttonSize="compressed"
+          legend={i18n.translate('xpack.lens.metric.prefix.label', {
+            defaultMessage: 'Prefix',
+          })}
+          data-test-subj="lnsMetric_prefix_buttons"
+          options={[
+            {
+              id: `${idPrefix}auto`,
+              label: i18n.translate('xpack.lens.metric.prefix.auto', {
+                defaultMessage: 'Auto',
+              }),
+              'data-test-subj': 'lnsMetric_prefix_auto',
+              value: undefined,
+            },
+            {
+              id: `${idPrefix}custom`,
+              label: i18n.translate('xpack.lens.metric.prefix.custom', {
+                defaultMessage: 'Custom',
+              }),
+              'data-test-subj': 'lnsMetric_prefix_custom',
+              value: defaultPrefix,
+            },
+            {
+              id: `${idPrefix}none`,
+              label: i18n.translate('xpack.lens.metric.prefix.none', {
+                defaultMessage: 'None',
+              }),
+              'data-test-subj': 'lnsMetric_prefix_none',
+              value: '',
+            },
+          ]}
+          idSelected={`${idPrefix}${
+            state.secondaryPrefix === undefined
+              ? 'auto'
+              : state.secondaryPrefix === ''
+              ? 'none'
+              : 'custom'
+          }`}
+          onChange={(_id, secondaryPrefix) => {
+            setState({
+              ...state,
+              secondaryPrefix,
+            });
+          }}
+        />
+        <EuiSpacer size="s" />
+        {state.secondaryPrefix && (
+          <DebouncedInput
+            data-test-subj="lnsMetric_prefix_custom_input"
+            compressed
+            value={state.secondaryPrefix}
+            onChange={(newPrefix) => {
               setState({
                 ...state,
-                secondaryPrefix,
+                secondaryPrefix: newPrefix,
               });
             }}
           />
-          <EuiSpacer size="s" />
-          {state.secondaryPrefix && (
-            <DebouncedInput
-              compressed
-              value={state.secondaryPrefix}
-              onChange={(newPrefix) => {
-                setState({
-                  ...state,
-                  secondaryPrefix: newPrefix,
-                });
-              }}
-            />
-          )}
-        </>
-      </EuiFormRow>
-    </div>
+        )}
+      </>
+    </EuiFormRow>
   );
 }
 
@@ -581,7 +580,6 @@ export function DimensionEditorAdditionalSection({
             }`}
             onChange={(id) => {
               const supportingVisualizationType = id.split('--')[1] as SupportingVisType;
-
               switch (supportingVisualizationType) {
                 case 'trendline':
                   setState({
diff --git a/x-pack/plugins/lens/public/visualizations/metric/to_expression.ts b/x-pack/plugins/lens/public/visualizations/metric/to_expression.ts
index dc5587c2543a6e..281e758fcbf445 100644
--- a/x-pack/plugins/lens/public/visualizations/metric/to_expression.ts
+++ b/x-pack/plugins/lens/public/visualizations/metric/to_expression.ts
@@ -148,13 +148,14 @@ export const toExpression = (
     progressDirection: state.progressDirection as LayoutDirection,
     color: state.color || getDefaultColor(state, isMetricNumeric),
     icon: state.icon,
-    palette: state.palette?.params
-      ? [
-          paletteService
-            .get(CUSTOM_PALETTE)
-            .toExpression(computePaletteParams(state.palette.params as CustomPaletteParams)),
-        ]
-      : [],
+    palette:
+      isMetricNumeric && state.palette?.params
+        ? [
+            paletteService
+              .get(CUSTOM_PALETTE)
+              .toExpression(computePaletteParams(state.palette.params as CustomPaletteParams)),
+          ]
+        : [],
     maxCols: state.maxCols ?? DEFAULT_MAX_COLUMNS,
     minTiles: maxPossibleTiles ?? undefined,
     inspectorTableId: state.layerId,