diff --git a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx
index 0b577ed65..afdaa397a 100644
--- a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx
+++ b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx
@@ -363,6 +363,7 @@ export default function ParameterComponent({
           <div className="mt-2 w-full">
           <KeypairListComponent
           disabled={disabled}
+          editNode={false}
           value={
             arrayOfObjects
           }
diff --git a/src/frontend/src/modals/EditNodeModal/index.tsx b/src/frontend/src/modals/EditNodeModal/index.tsx
index e8a9308b7..66973a343 100644
--- a/src/frontend/src/modals/EditNodeModal/index.tsx
+++ b/src/frontend/src/modals/EditNodeModal/index.tsx
@@ -8,6 +8,7 @@ import InputComponent from "../../components/inputComponent";
 import InputFileComponent from "../../components/inputFileComponent";
 import InputListComponent from "../../components/inputListComponent";
 import IntComponent from "../../components/intComponent";
+import KeypairListComponent from "../../components/keypairListComponent";
 import PromptAreaComponent from "../../components/promptComponent";
 import TextAreaComponent from "../../components/textAreaComponent";
 import ToggleShadComponent from "../../components/toggleShadComponent";
@@ -78,6 +79,18 @@ const EditNodeModal = forwardRef(
       setMyData(data); // reset data to what it is on node when opening modal
     }, [modalOpen]);
 
+    const [arrayOfObjects, setArrayOfObjects] = useState([
+      { key1: "value1", key2: "value2" },
+      { key3: "value3", key4: "value4" },
+      { key5: "value5", key6: "value6" },
+    ]);
+
+    const handleOnNewValueTest = (newValue): void => {
+      let newData = cloneDeep(arrayOfObjects);
+      newData = newValue;
+      setArrayOfObjects(newData);
+    };
+
     return (
       <BaseModal size="large-h-full" open={modalOpen} setOpen={setModalOpen}>
         <BaseModal.Trigger>{children}</BaseModal.Trigger>
@@ -336,6 +349,16 @@ const EditNodeModal = forwardRef(
                                     }}
                                   />
                                 </div>
+                              ) : myData.node?.template[templateParam].type ===
+                                "keypair" ? (
+                                <div className="mt-2 w-full">
+                                  <KeypairListComponent
+                                    disabled={disabled}
+                                    value={arrayOfObjects}
+                                    onChange={handleOnNewValueTest}
+                                    editNode={true}
+                                  />
+                                </div>
                               ) : myData.node?.template[templateParam].type ===
                                 "Any" ? (
                                 "-"