diff --git a/public/app/features/trails/ActionTabs/BreakdownScene.tsx b/public/app/features/trails/ActionTabs/BreakdownScene.tsx
index beb75b4591d..3c4fb41b241 100644
--- a/public/app/features/trails/ActionTabs/BreakdownScene.tsx
+++ b/public/app/features/trails/ActionTabs/BreakdownScene.tsx
@@ -19,11 +19,12 @@ import {
   SceneQueryRunner,
   VariableDependencyConfig,
 } from '@grafana/scenes';
-import { Button, Field, Select, RadioButtonGroup, useStyles2 } from '@grafana/ui';
+import { Button, Field, useStyles2 } from '@grafana/ui';
 import { ALL_VARIABLE_VALUE } from 'app/features/variables/constants';
 
 import { getAutoQueriesForMetric } from '../AutomaticMetricQueries/AutoQueryEngine';
 import { AutoQueryDef } from '../AutomaticMetricQueries/types';
+import { BreakdownLabelSelector } from '../BreakdownLabelSelector';
 import { MetricScene } from '../MetricScene';
 import { trailDS, VAR_FILTERS, VAR_GROUP_BY, VAR_GROUP_BY_EXP } from '../shared';
 import { getColorByIndex } from '../utils';
@@ -129,25 +130,16 @@ export class BreakdownScene extends SceneObjectBase<BreakdownSceneState> {
     const { labels, body, loading, value } = model.useState();
     const styles = useStyles2(getStyles);
 
-    const useHorizontalLabelSelector = labels.length <= 6;
-
     return (
       <div className={styles.container}>
         {loading && <div>Loading...</div>}
         <div className={styles.controls}>
           {!loading && (
-            <Field label="By label">
-              {useHorizontalLabelSelector ? (
-                <RadioButtonGroup options={labels} value={value} onChange={model.onChange} />
-              ) : (
-                <Select
-                  options={labels}
-                  value={value}
-                  onChange={(selected) => model.onChange(selected.value)}
-                  className={styles.select}
-                />
-              )}
-            </Field>
+            <div className={styles.controlsLeft}>
+              <Field label="By label">
+                <BreakdownLabelSelector options={labels} value={value} onChange={model.onChange} />
+              </Field>
+            </div>
           )}
           {body instanceof LayoutSwitcher && (
             <div className={styles.controlsRight}>
@@ -174,10 +166,6 @@ function getStyles(theme: GrafanaTheme2) {
       display: 'flex',
       paddingTop: theme.spacing(0),
     }),
-    tabHeading: css({
-      paddingRight: theme.spacing(2),
-      fontWeight: theme.typography.fontWeightMedium,
-    }),
     controls: css({
       flexGrow: 0,
       display: 'flex',
@@ -185,12 +173,16 @@ function getStyles(theme: GrafanaTheme2) {
       gap: theme.spacing(2),
     }),
     controlsRight: css({
-      flexGrow: 1,
+      flexGrow: 0,
       display: 'flex',
       justifyContent: 'flex-end',
     }),
-    select: css({
-      minWidth: theme.spacing(16),
+    controlsLeft: css({
+      display: 'flex',
+      justifyContent: 'flex-left',
+      justifyItems: 'left',
+      width: '100%',
+      flexDirection: 'column',
     }),
   };
 }
diff --git a/public/app/features/trails/BreakdownLabelSelector.tsx b/public/app/features/trails/BreakdownLabelSelector.tsx
new file mode 100644
index 00000000000..25191aaa53a
--- /dev/null
+++ b/public/app/features/trails/BreakdownLabelSelector.tsx
@@ -0,0 +1,60 @@
+import { css } from '@emotion/css';
+import { useResizeObserver } from '@react-aria/utils';
+import React, { useEffect, useRef, useState } from 'react';
+
+import { GrafanaTheme2, SelectableValue } from '@grafana/data';
+import { Select, RadioButtonGroup, useStyles2, useTheme2, measureText } from '@grafana/ui';
+
+type Props = {
+  options: Array<SelectableValue<string>>;
+  value?: string;
+  onChange: (label: string | undefined) => void;
+};
+
+export function BreakdownLabelSelector({ options, value, onChange }: Props) {
+  const styles = useStyles2(getStyles);
+  const theme = useTheme2();
+
+  const [labelSelectorRequiredWidth, setLabelSelectorRequiredWidth] = useState<number>(0);
+  const [availableWidth, setAvailableWidth] = useState<number>(0);
+
+  const useHorizontalLabelSelector = availableWidth > labelSelectorRequiredWidth;
+
+  const controlsContainer = useRef<HTMLDivElement>(null);
+
+  useResizeObserver({
+    ref: controlsContainer,
+    onResize: () => {
+      const element = controlsContainer.current;
+      if (element) {
+        setAvailableWidth(element.clientWidth);
+      }
+    },
+  });
+
+  useEffect(() => {
+    const { fontSize } = theme.typography;
+    const text = options.map((option) => option.label || option.value || '').join(' ');
+    const textWidth = measureText(text, fontSize).width;
+    const additionalWidthPerItem = 32;
+    setLabelSelectorRequiredWidth(textWidth + additionalWidthPerItem * options.length);
+  }, [options, theme]);
+
+  return (
+    <div ref={controlsContainer}>
+      {useHorizontalLabelSelector ? (
+        <RadioButtonGroup {...{ options, value, onChange }} />
+      ) : (
+        <Select {...{ options, value }} onChange={(selected) => onChange(selected.value)} className={styles.select} />
+      )}
+    </div>
+  );
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    select: css({
+      maxWidth: theme.spacing(16),
+    }),
+  };
+}