2 files changed, 8 insertions, 6 deletions
diff --git a/modern/src/common/components/SelectField.js b/modern/src/common/components/SelectField.js
index 2ee2f147..35f817a0 100644
--- a/modern/src/common/components/SelectField.js
+++ b/modern/src/common/components/SelectField.js
@@ -6,6 +6,7 @@ import { useEffectAsync } from '../../reactHelper';
 
 const SelectField = ({
   label,
+  fullWidth,
   multiple,
   value,
   emptyValue = 0,
@@ -31,7 +32,7 @@ const SelectField = ({
 
   if (items) {
     return (
-      <FormControl>
+      <FormControl fullWidth={fullWidth}>
         <InputLabel>{label}</InputLabel>
         <Select
           label={label}
diff --git a/modern/src/common/components/SplitButton.js b/modern/src/common/components/SplitButton.js
index bdf12870..114370c7 100644
--- a/modern/src/common/components/SplitButton.js
+++ b/modern/src/common/components/SplitButton.js
@@ -1,16 +1,17 @@
 import React, { useRef, useState } from 'react';
-import { Button, ButtonGroup, Menu, MenuItem, Typography } from '@mui/material';
+import {
+  Button, ButtonGroup, Menu, MenuItem, Typography,
+} from '@mui/material';
 import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown';
 
-const SplitButton = ({ fullWidth, variant, color, disabled, onClick, options }) => {
+const SplitButton = ({ fullWidth, variant, color, disabled, onClick, options, selected, setSelected }) => {
   const anchorRef = useRef();
   const [menuAnchorEl, setMenuAnchorEl] = useState(null);
-  const [selected, setSelected] = useState(Object.keys(options)[0]);
 
   return (
     <>
-      <ButtonGroup fullWidth={fullWidth} variant={variant} color={color} disabled={disabled} ref={anchorRef}>
-        <Button onClick={() => onClick(selected)}>
+      <ButtonGroup fullWidth={fullWidth} variant={variant} color={color} ref={anchorRef}>
+        <Button disabled={disabled} onClick={() => onClick(selected)}>
           <Typography variant="button" noWrap>{options[selected]}</Typography>
         </Button>
         <Button fullWidth={false} size="small" onClick={() => setMenuAnchorEl(anchorRef.current)}>