diff --git a/src/common/components/forms/FormLabelStart.tsx b/src/common/components/forms/FormLabelStart.tsx
index a019574bc..b17dcda2b 100644
--- a/src/common/components/forms/FormLabelStart.tsx
+++ b/src/common/components/forms/FormLabelStart.tsx
@@ -8,28 +8,39 @@ import { GoodTooltip } from '~/common/components/GoodTooltip';
 import WarningRoundedIcon from '@mui/icons-material/WarningRounded';
 
 
+const _styles = {
+  label: {
+    flexWrap: 'nowrap',
+    whiteSpace: 'nowrap',
+  } as const,
+  labelClickable: {
+    flexWrap: 'nowrap',
+    whiteSpace: 'nowrap',
+    cursor: 'pointer',
+    textDecoration: 'underline',
+  } as const,
+} as const;
+
+
 /**
  * Shared label part (left side)
  */
-const FormLabelStartBase = (props: {
+export const FormLabelStart = React.memo(function FormLabelStartBase(props: {
   title: React.ReactNode,
   description?: React.ReactNode,
   tooltip?: React.ReactNode,
   tooltipWarning?: boolean,
   onClick?: (event: React.MouseEvent) => void,
   sx?: SxProps,
-}) =>
-  <div>
+}) {
+  return <div>
     {/* Title */}
     <FormLabel
       onClick={props.onClick}
-      sx={{
-        // minWidth: formLabelStartWidth,
-        flexWrap: 'nowrap',
-        whiteSpace: 'nowrap',
-        ...(!!props.onClick && { cursor: 'pointer', textDecoration: 'underline' }),
-        ...props.sx,
-      }}
+      sx={props.onClick ? _styles.labelClickable
+        : props.sx ? { ..._styles.label, ...props.sx }
+          : _styles.label
+      }
     >
       {props.title} {!!props.tooltip && (
       <GoodTooltip title={props.tooltip} arrow placement='top'>
@@ -53,6 +64,4 @@ const FormLabelStartBase = (props: {
       </FormHelperText>
     )}
   </div>;
-FormLabelStartBase.displayName = 'FormLabelStart';
-
-export const FormLabelStart = React.memo(FormLabelStartBase);
\ No newline at end of file
+});