diff --git a/src/lib/kit/components/Layouts/Row/Row.scss b/src/lib/kit/components/Layouts/Row/Row.scss
index 400807a0..c72bbeaa 100644
--- a/src/lib/kit/components/Layouts/Row/Row.scss
+++ b/src/lib/kit/components/Layouts/Row/Row.scss
@@ -65,6 +65,7 @@
         display: flex;
         flex-direction: column;
         flex-grow: 1;
+        width: 0;
         margin-left: var(--df-row-right-margin-left, var(--g-spacing-4));
 
         &-inner {
diff --git a/src/lib/kit/hooks/useOneOf/useOneOf.tsx b/src/lib/kit/hooks/useOneOf/useOneOf.tsx
index b79a845c..201c7214 100644
--- a/src/lib/kit/hooks/useOneOf/useOneOf.tsx
+++ b/src/lib/kit/hooks/useOneOf/useOneOf.tsx
@@ -189,11 +189,16 @@ export const useOneOf = ({props, onTogglerChange}: UseOneOfParams) => {
             <SegmentedRadioGroup
                 value={oneOfValue}
                 onChange={(event) => onOneOfChange([event.target.value])}
+                width="auto"
                 disabled={spec.viewSpec.disabled}
                 qa={name}
             >
                 {options.map((option) => (
-                    <SegmentedRadioGroup.Option key={option.value} value={option.value}>
+                    <SegmentedRadioGroup.Option
+                        key={option.value}
+                        value={option.value}
+                        title={option.title}
+                    >
                         {option.title}
                     </SegmentedRadioGroup.Option>
                 ))}