diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsUpdateDataModelObjectAboutForm.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsUpdateDataModelObjectAboutForm.tsx
index 3db53d917a..246e235b38 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsUpdateDataModelObjectAboutForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsUpdateDataModelObjectAboutForm.tsx
@@ -125,7 +125,7 @@ export const SettingsUpdateDataModelObjectAboutForm = ({
formConfig.handleSubmit(handleSave)()}
- disableEdition={!objectMetadataItem.isCustom || readonly}
+ disableEdition={readonly}
objectMetadataItem={objectMetadataItem}
/>
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx
index 1a6dddbefb..a075554cea 100644
--- a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx
@@ -81,6 +81,8 @@ export const SettingsDataModelObjectAboutForm = ({
const isLabelSyncedWithName = watch('isLabelSyncedWithName');
const labelSingular = watch('labelSingular');
const labelPlural = watch('labelPlural');
+ const isStandardObject =
+ isDefined(objectMetadataItem?.isCustom) && !objectMetadataItem.isCustom;
watch('nameSingular');
watch('namePlural');
watch('description');
@@ -173,12 +175,7 @@ export const SettingsDataModelObjectAboutForm = ({
}
}}
onBlur={() => onNewDirtyField?.()}
- disabled={
- disableEdition ||
- (objectMetadataItem &&
- !objectMetadataItem?.isCustom &&
- isLabelSyncedWithName)
- }
+ disabled={disableEdition}
fullWidth
maxLength={OBJECT_NAME_MAXIMUM_LENGTH}
/>
@@ -205,12 +202,7 @@ export const SettingsDataModelObjectAboutForm = ({
}
}}
onBlur={() => onNewDirtyField?.()}
- disabled={
- disableEdition ||
- (objectMetadataItem &&
- !objectMetadataItem?.isCustom &&
- isLabelSyncedWithName)
- }
+ disabled={disableEdition}
fullWidth
maxLength={OBJECT_NAME_MAXIMUM_LENGTH}
/>
@@ -242,7 +234,8 @@ export const SettingsDataModelObjectAboutForm = ({
'nameSingular' as const satisfies StringKeyOf,
placeholder: `listing`,
defaultValue: objectMetadataItem?.nameSingular ?? '',
- disableEdition: disableEdition || isLabelSyncedWithName,
+ disableEdition:
+ isStandardObject || disableEdition || isLabelSyncedWithName,
tooltip: apiNameTooltipText,
},
{
@@ -251,7 +244,8 @@ export const SettingsDataModelObjectAboutForm = ({
'namePlural' as const satisfies StringKeyOf,
placeholder: `listings`,
defaultValue: objectMetadataItem?.namePlural ?? '',
- disableEdition: disableEdition || isLabelSyncedWithName,
+ disableEdition:
+ isStandardObject || disableEdition || isLabelSyncedWithName,
tooltip: apiNameTooltipText,
},
].map(
@@ -319,7 +313,7 @@ export const SettingsDataModelObjectAboutForm = ({
),
)}
- {(!objectMetadataItem || objectMetadataItem?.isCustom) && (
+ {!isStandardObject && (