diff --git a/src/frontend/src/modals/editNodeModal/hooks/use-row-data.tsx b/src/frontend/src/modals/editNodeModal/hooks/use-row-data.tsx
index b7afa11f5..3e165d404 100644
--- a/src/frontend/src/modals/editNodeModal/hooks/use-row-data.tsx
+++ b/src/frontend/src/modals/editNodeModal/hooks/use-row-data.tsx
@@ -1,5 +1,5 @@
+import sortFields from "@/CustomNodes/utils/sort-fields";
 import { useMemo } from "react";
-import { LANGFLOW_SUPPORTED_TYPES } from "../../../constants/constants";
 import { APIClassType } from "../../../types/api";
 import { NodeDataType } from "../../../types/flow";
 
@@ -21,6 +21,7 @@ const useRowData = (
           )
         );
       })
+      .sort((a, b) => sortFields(a, b, myData.node?.field_order ?? []))
       .map((key: string) => {
         const templateParam = myData.node!.template[key] as any;
         return {