diff --git a/frontend/public/locales/en/translation.json b/frontend/public/locales/en/translation.json
index dd9bad2a..c094ede1 100644
--- a/frontend/public/locales/en/translation.json
+++ b/frontend/public/locales/en/translation.json
@@ -189,7 +189,6 @@
     "entities": "Content Types",
     "new_content_type": "New Content Type",
     "edit_content_type": "Edit Content Type",
-    "manage_fields": "Manage Fields",
     "nodes": "Content",
     "new_node": "New Content",
     "edit_node": "Edit Content",
diff --git a/frontend/public/locales/fr/translation.json b/frontend/public/locales/fr/translation.json
index 7ce2c0dd..881393a0 100644
--- a/frontend/public/locales/fr/translation.json
+++ b/frontend/public/locales/fr/translation.json
@@ -189,7 +189,6 @@
     "entities": "Types de contenu",
     "new_content_type": "Nouveau type de contenu",
     "edit_content_type": "Modifier le type de contenu",
-    "manage_fields": "Gérer les champs",
     "nodes": "Contenu",
     "new_node": "Nouveau contenu",
     "edit_node": "Modifier le contenu",
diff --git a/frontend/src/components/content-types/ContentTypeDialog.tsx b/frontend/src/components/content-types/ContentTypeDialog.tsx
index c53a093e..0d4bcbd9 100644
--- a/frontend/src/components/content-types/ContentTypeDialog.tsx
+++ b/frontend/src/components/content-types/ContentTypeDialog.tsx
@@ -93,6 +93,7 @@ export const ContentTypeDialog: FC<ContentTypeDialogProps> = ({
     if (data) {
       reset({
         name: data.name,
+        fields: data.fields || [],
       });
     } else {
       reset();
diff --git a/frontend/src/components/content-types/EditContentTypeFieldsDialog.tsx b/frontend/src/components/content-types/EditContentTypeFieldsDialog.tsx
deleted file mode 100644
index a2437e75..00000000
--- a/frontend/src/components/content-types/EditContentTypeFieldsDialog.tsx
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright © 2024 Hexastack. All rights reserved.
- *
- * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
- * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
- * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
- */
-
-import AddIcon from "@mui/icons-material/Add";
-import {
-  Button,
-  CircularProgress,
-  Dialog,
-  DialogActions,
-  DialogContent,
-  Stack,
-} from "@mui/material";
-import { useEffect } from "react";
-import { useFieldArray, useForm } from "react-hook-form";
-
-import DialogButtons from "@/app-components/buttons/DialogButtons";
-import {
-  DialogTitle,
-  ContentContainer,
-  ContentItem,
-} from "@/app-components/dialogs";
-import { Input } from "@/app-components/inputs/Input";
-import { useGet } from "@/hooks/crud/useGet";
-import { useUpdate } from "@/hooks/crud/useUpdate";
-import { DialogControlProps } from "@/hooks/useDialog";
-import { useToast } from "@/hooks/useToast";
-import { useTranslate } from "@/hooks/useTranslate";
-import { EntityType } from "@/services/types";
-import { ContentFieldType, IContentType } from "@/types/content-type.types";
-
-import { FieldInput } from "./components/FieldInput";
-import { FIELDS_FORM_DEFAULT_VALUES, READ_ONLY_FIELDS } from "./constants";
-
-export type EditContentTypeDialogFieldsProps = DialogControlProps<IContentType>;
-
-export const EditContentTypeFieldsDialog = ({
-  data: contentType,
-  closeDialog,
-  open,
-}: EditContentTypeDialogFieldsProps) => {
-  const { t } = useTranslate();
-  const { isLoading, data, refetch } = useGet(contentType?.id || "", {
-    entity: EntityType.CONTENT_TYPE,
-  });
-  const { toast } = useToast();
-  const {
-    handleSubmit,
-    control,
-    reset,
-    setValue,
-    register,
-    formState: { errors },
-  } = useForm<Partial<IContentType>>({
-    mode: "onChange",
-    values: {
-      fields: data?.fields,
-      name: data?.name,
-    },
-    defaultValues: {
-      fields: FIELDS_FORM_DEFAULT_VALUES,
-      name: data?.name,
-    },
-  });
-  const { append, fields, replace, remove } = useFieldArray<
-    Pick<IContentType, "fields">,
-    "fields"
-  >({
-    name: "fields",
-    control,
-    keyName: "id",
-    rules: {
-      required: true,
-    },
-  });
-  const validationRules = {
-    name: {
-      required: t("message.name_is_required"),
-    },
-  };
-
-  useEffect(() => {
-    register("fields");
-  }, [register]);
-
-  useEffect(() => {
-    if (data?.fields) {
-      replace(data.fields);
-    }
-  }, [data, replace]);
-
-  useEffect(() => {
-    if (!open) {
-      reset();
-    }
-    if (open) {
-      refetch();
-    }
-  }, [open, reset]);
-
-  useEffect(() => {
-    if (data) {
-      reset({
-        name: data.name,
-        fields: data.fields,
-      });
-    } else {
-      reset();
-    }
-  }, [data, reset]);
-
-  function handleClose() {
-    closeDialog();
-  }
-
-  const { mutateAsync: updateContentType } = useUpdate(
-    EntityType.CONTENT_TYPE,
-    {
-      onError: (error) => {
-        toast.error(`${t("message.internal_server_error")}: ${error}`);
-      },
-      onSuccess: () => {
-        toast.success(t("message.success_save"));
-      },
-    },
-  );
-
-  return (
-    <Dialog
-      open={open}
-      fullWidth
-      maxWidth="xl"
-      sx={{ width: "fit-content", mx: "auto", minWidth: "600px" }}
-      onClose={handleClose}
-    >
-      <DialogTitle onClose={handleClose}>
-        {t("title.manage_fields")}
-      </DialogTitle>
-      <form
-        onSubmit={handleSubmit(async ({ name, fields }) => {
-          if (!!contentType)
-            await updateContentType({
-              id: contentType.id,
-              params: {
-                name,
-                fields,
-              },
-            });
-          handleClose();
-        })}
-      >
-        <DialogContent>
-          <ContentContainer>
-            <ContentItem>
-              <Input
-                label={t("label.name")}
-                error={!!errors.name}
-                {...register("name", validationRules.name)}
-                helperText={errors.name ? errors.name.message : null}
-                required
-                autoFocus
-              />
-            </ContentItem>
-            {!isLoading
-              ? fields.map((f, index) => (
-                  <ContentItem
-                    key={f.id}
-                    justifyContent="space-between"
-                    alignItems="center"
-                    gap={2}
-                    display="flex"
-                  >
-                    <FieldInput
-                      setValue={setValue}
-                      control={control}
-                      remove={remove}
-                      index={index}
-                      disabled={READ_ONLY_FIELDS.includes(f.label as any)}
-                    />
-                  </ContentItem>
-                ))
-              : null}
-            {isLoading ? (
-              <ContentItem>
-                <Stack sx={{ alignItems: "center", placeContent: "center" }}>
-                  <CircularProgress sx={{ color: "primary.main" }} />
-                </Stack>
-              </ContentItem>
-            ) : null}
-            <ContentItem>
-              <Button
-                startIcon={<AddIcon />}
-                variant="contained"
-                onClick={() =>
-                  append({
-                    label: "",
-                    name: "",
-                    type: ContentFieldType.TEXT,
-                  })
-                }
-                disabled={isLoading}
-                sx={{ mx: "auto" }}
-              >
-                {t("button.add")}
-              </Button>
-            </ContentItem>
-          </ContentContainer>
-        </DialogContent>
-        <DialogActions>
-          <DialogButtons closeDialog={closeDialog} />
-        </DialogActions>
-      </form>
-    </Dialog>
-  );
-};
diff --git a/frontend/src/components/content-types/index.tsx b/frontend/src/components/content-types/index.tsx
index 84cf93c0..46ef5638 100644
--- a/frontend/src/components/content-types/index.tsx
+++ b/frontend/src/components/content-types/index.tsx
@@ -1,11 +1,12 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
+
 import { faAlignLeft } from "@fortawesome/free-solid-svg-icons";
 import AddIcon from "@mui/icons-material/Add";
 import { Button, Grid, Paper } from "@mui/material";
@@ -33,7 +34,6 @@ import { PermissionAction } from "@/types/permission.types";
 import { getDateTimeFormatter } from "@/utils/date";
 
 import { ContentTypeDialog } from "./ContentTypeDialog";
-import { EditContentTypeFieldsDialog } from "./EditContentTypeFieldsDialog";
 
 export const ContentTypes = () => {
   const { t } = useTranslate();
@@ -125,7 +125,7 @@ export const ContentTypes = () => {
                 deleteContentType(deleteDialogCtl.data);
             }}
           />
-          <EditContentTypeFieldsDialog {...fieldsDialogCtl} />
+          <ContentTypeDialog {...getDisplayDialogs(fieldsDialogCtl)} />
           <Grid padding={2} container>
             <Grid item width="100%">
               <DataGrid