diff --git a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx
index 7201bba3b..936e65893 100644
--- a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx
+++ b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx
@@ -304,7 +304,10 @@ export default function ParameterComponent({
   ) : (
     <div
       ref={ref}
-      className="relative mt-1 flex w-full flex-wrap items-center justify-between bg-muted px-5 py-2"
+      className={
+        "relative mt-1 flex w-full flex-wrap items-center justify-between bg-muted px-5 py-2" +
+        (type === "code" ? " hidden " : "")
+      }
     >
       <>
         <div
@@ -456,7 +459,7 @@ export default function ParameterComponent({
             )}
           </div>
         ) : left === true && type === "code" ? (
-          <div className="mt-2 w-full">
+          <div className="mt-2 hidden w-full">
             <CodeAreaComponent
               readonly={
                 data.node?.flow && data.node.template[name].dynamic
diff --git a/src/frontend/src/components/codeAreaComponent/index.tsx b/src/frontend/src/components/codeAreaComponent/index.tsx
index 9dac530e9..f5f2947b5 100644
--- a/src/frontend/src/components/codeAreaComponent/index.tsx
+++ b/src/frontend/src/components/codeAreaComponent/index.tsx
@@ -14,6 +14,7 @@ export default function CodeAreaComponent({
   setNodeClass,
   id = "",
   readonly = false,
+  openModal,
 }: CodeAreaComponentType) {
   const [myValue, setMyValue] = useState(
     typeof value == "string" ? value : JSON.stringify(value)
@@ -32,6 +33,7 @@ export default function CodeAreaComponent({
   return (
     <div className={disabled ? "pointer-events-none w-full " : " w-full"}>
       <CodeAreaModal
+        openModal={openModal}
         readonly={readonly}
         dynamic={dynamic}
         value={myValue}
diff --git a/src/frontend/src/modals/codeAreaModal/index.tsx b/src/frontend/src/modals/codeAreaModal/index.tsx
index 1c737417d..9ba83c056 100644
--- a/src/frontend/src/modals/codeAreaModal/index.tsx
+++ b/src/frontend/src/modals/codeAreaModal/index.tsx
@@ -24,6 +24,7 @@ export default function CodeAreaModal({
   children,
   dynamic,
   readonly = false,
+  openModal,
 }: codeAreaModalPropsType): JSX.Element {
   const [code, setCode] = useState(value);
   const dark = useDarkStore((state) => state.dark);
@@ -43,6 +44,10 @@ export default function CodeAreaModal({
     }
   }, []);
 
+  useEffect(() => {
+    if (openModal) setOpen(true);
+  }, [openModal]);
+
   function processNonDynamicField() {
     postValidateCode(code)
       .then((apiReturn) => {
diff --git a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
index e25544bdf..8a52abdb9 100644
--- a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
@@ -1,6 +1,7 @@
 import { cloneDeep } from "lodash";
 import { useEffect, useState } from "react";
 import ShadTooltip from "../../../../components/ShadTooltipComponent";
+import CodeAreaComponent from "../../../../components/codeAreaComponent";
 import IconComponent from "../../../../components/genericIconComponent";
 import {
   Select,
@@ -15,6 +16,7 @@ import { useDarkStore } from "../../../../stores/darkStore";
 import useFlowStore from "../../../../stores/flowStore";
 import useFlowsManagerStore from "../../../../stores/flowsManagerStore";
 import { useStoreStore } from "../../../../stores/storeStore";
+import { APIClassType } from "../../../../types/api";
 import { nodeToolbarPropsType } from "../../../../types/components";
 import { FlowType } from "../../../../types/flow";
 import {
@@ -32,6 +34,7 @@ export default function NodeToolbarComponent({
   setShowNode,
   numberOfHandles,
   showNode,
+  name = "code",
 }: nodeToolbarPropsType): JSX.Element {
   const nodeLength = Object.keys(data.node!.template).filter(
     (templateField) =>
@@ -123,6 +126,9 @@ export default function NodeToolbarComponent({
       case "override":
         setShowOverrideModal(true);
         break;
+      case "delete":
+        deleteNode(data.id);
+        break;
     }
   };
 
@@ -130,19 +136,84 @@ export default function NodeToolbarComponent({
     Object.values(flow).includes(data.node?.display_name!)
   );
 
+  const setNode = useFlowStore((state) => state.setNode);
+
+  const handleOnNewValue = (
+    newValue: string | string[] | boolean | Object[]
+  ): void => {
+    if (data.node!.template[name].value !== newValue) {
+      takeSnapshot();
+    }
+
+    data.node!.template[name].value = newValue; // necessary to enable ctrl+z inside the input
+
+    setNode(data.id, (oldNode) => {
+      let newNode = cloneDeep(oldNode);
+
+      newNode.data = {
+        ...newNode.data,
+      };
+
+      newNode.data.node.template[name].value = newValue;
+
+      return newNode;
+    });
+  };
+
+  const handleNodeClass = (newNodeClass: APIClassType, code?: string): void => {
+    if (!data.node) return;
+    if (data.node!.template[name].value !== code) {
+      takeSnapshot();
+    }
+
+    setNode(data.id, (oldNode) => {
+      let newNode = cloneDeep(oldNode);
+
+      newNode.data = {
+        ...newNode.data,
+        node: newNodeClass,
+        description: newNodeClass.description ?? data.node!.description,
+        display_name: newNodeClass.display_name ?? data.node!.display_name,
+      };
+
+      newNode.data.node.template[name].value = code;
+
+      return newNode;
+    });
+  };
+
+  const [openModal, setOpenModal] = useState(false);
+
   return (
     <>
       <div className="w-26 h-10">
         <span className="isolate inline-flex rounded-md shadow-sm">
-          <ShadTooltip content="Delete" side="top">
+          <ShadTooltip content="Code" side="top">
             <button
               className="relative inline-flex items-center rounded-l-md  bg-background px-2 py-2 text-foreground shadow-md ring-1 ring-inset ring-ring transition-all duration-500 ease-in-out hover:bg-muted focus:z-10"
               onClick={() => {
-                deleteNode(data.id);
+                setOpenModal(!openModal);
               }}
               data-testid="delete-button-modal"
             >
-              <IconComponent name="Trash2" className="h-4 w-4" />
+              <div className="hidden">
+                <CodeAreaComponent
+                  openModal={openModal}
+                  readonly={
+                    data.node?.flow && data.node.template[name].dynamic
+                      ? true
+                      : false
+                  }
+                  dynamic={data.node?.template[name].dynamic ?? false}
+                  setNodeClass={handleNodeClass}
+                  nodeClass={data.node}
+                  disabled={false}
+                  value={data.node?.template[name].value ?? ""}
+                  onChange={handleOnNewValue}
+                  id={"code-input-node-toolbar-" + name}
+                />
+              </div>
+              <IconComponent name="Code2" className="h-4 w-4" />
             </button>
           </ShadTooltip>
 
@@ -288,6 +359,16 @@ export default function NodeToolbarComponent({
                   </div>
                 </SelectItem>
               )}
+
+              <SelectItem value={"delete"}>
+                <div className="font-red flex text-red-500 hover:text-red-500">
+                  <IconComponent
+                    name="Trash2"
+                    className="relative top-0.5 mr-2 h-4 w-4 "
+                  />{" "}
+                  Delete{" "}
+                </div>
+              </SelectItem>
             </SelectContent>
           </Select>
 
diff --git a/src/frontend/src/types/components/index.ts b/src/frontend/src/types/components/index.ts
index 1bb25c686..3e3807e50 100644
--- a/src/frontend/src/types/components/index.ts
+++ b/src/frontend/src/types/components/index.ts
@@ -112,6 +112,7 @@ export type CodeAreaComponentType = {
   dynamic?: boolean;
   id?: string;
   readonly?: boolean;
+  openModal?: boolean;
 };
 
 export type FileComponentType = {
@@ -480,6 +481,7 @@ export type nodeToolbarPropsType = {
   setShowNode: (boolean: any) => void;
   numberOfHandles: number;
   showNode: boolean;
+  name?: string;
 };
 
 export type parsedDataType = {
@@ -513,6 +515,7 @@ export type codeAreaModalPropsType = {
   children: ReactNode;
   dynamic?: boolean;
   readonly?: boolean;
+  openModal?: boolean;
 };
 
 export type chatMessagePropsType = {
diff --git a/src/frontend/src/utils/styleUtils.ts b/src/frontend/src/utils/styleUtils.ts
index 41ec2d047..5a7676453 100644
--- a/src/frontend/src/utils/styleUtils.ts
+++ b/src/frontend/src/utils/styleUtils.ts
@@ -16,6 +16,7 @@ import {
   ChevronsUpDown,
   Circle,
   Clipboard,
+  Code,
   Code2,
   Combine,
   Compass,
@@ -395,4 +396,5 @@ export const nodeIconsLucide: iconsType = {
   Repeat,
   io: ArrowDownUp,
   ScreenShare,
+  Code,
 };