diff --git a/src/components/EditorSidePanel/TablesTab/TableField.jsx b/src/components/EditorSidePanel/TablesTab/TableField.jsx
index c263aee36..6b6165b00 100644
--- a/src/components/EditorSidePanel/TablesTab/TableField.jsx
+++ b/src/components/EditorSidePanel/TablesTab/TableField.jsx
@@ -122,6 +122,7 @@ export default function TableField({ data, tid, index }) {
         </Col>
         <Col span={8}>
           <Select
+          disabled={!!data.foreignK}
             className="w-full"
             optionList={[
               ...Object.keys(dbToTypes[database]).map((value) => ({
@@ -303,6 +304,7 @@ export default function TableField({ data, tid, index }) {
             <>
               <Col span={12}>
                 <InputNumber
+                  disabled={data.foreignK}
                   placeholder="Precision"
                   value={
                     data.size && data.size.includes(",")
@@ -344,6 +346,7 @@ export default function TableField({ data, tid, index }) {
               </Col>
               <Col span={12}>
                 <InputNumber
+                  disabled={data.foreignK}
                   placeholder="Scale"
                   value={
                     data.size && data.size.includes(",")
@@ -394,6 +397,7 @@ export default function TableField({ data, tid, index }) {
           ) : (
             <Col span={24}>
               <InputNumber
+                disabled={data.foreignK}
                 placeholder={t("Length/Size")}
                 value={data.size}
                 className="w-full"
diff --git a/src/context/DiagramContext.jsx b/src/context/DiagramContext.jsx
index dd84c84a2..f9d660c2b 100644
--- a/src/context/DiagramContext.jsx
+++ b/src/context/DiagramContext.jsx
@@ -240,6 +240,42 @@ export default function DiagramContextProvider({ children }) {
             fields: newFields,
           };
         }
+        if (updatedValues.type||updatedValues.precision!=undefined||updatedValues.scale!=undefined||updatedValues.size!=undefined) {
+          const updatedFields = table.fields.map((f) => {
+            if (f.foreignK === true && f.foreignKey?.tableId === tid && f.foreignKey?.fieldId === fid) {
+              
+              const newType = updatedValues.type || f.type;
+              const dbSettings = settings?.defaultTypeSizes?.[database];
+              const typeDefaultConfig = dbSettings[newType];
+              
+              let newPrecision = f.precision;
+              let newScale = f.scale;
+              let newSize = f.size;
+
+              if (updatedValues.type !== undefined) {
+                if (typeof typeDefaultConfig === 'object') {
+                  newPrecision = typeDefaultConfig.precision ?? 10;
+                  newScale = typeDefaultConfig.scale ?? 2;
+                } else if (typeof typeDefaultConfig === 'number') {
+                    newSize = typeDefaultConfig;
+                }
+              }
+              if (updatedValues.precision !== undefined) newPrecision = updatedValues.precision;
+              if (updatedValues.scale !== undefined) newScale = updatedValues.scale;
+              if (updatedValues.size !== undefined) newSize = updatedValues.size;
+
+              return { 
+                ...f, 
+                type: newType,
+                precision: newPrecision,
+                scale: newScale,
+                size: newSize
+              };
+            }
+            return f;
+          });
+          return { ...table, fields: updatedFields };
+        }
         return table;
       }),
     );