diff --git a/src/frontend/src/modals/EditNodeModal/index.tsx b/src/frontend/src/modals/EditNodeModal/index.tsx
index d4707c140..aba6f2db4 100644
--- a/src/frontend/src/modals/EditNodeModal/index.tsx
+++ b/src/frontend/src/modals/EditNodeModal/index.tsx
@@ -76,6 +76,7 @@ const EditNodeModal = forwardRef(
     function changeAdvanced(n) {
       myData.current.node!.template[n].advanced =
         !myData.current.node!.template[n].advanced;
+      setAdv(!adv);
     }
 
     const handleOnNewValue = (newValue: any, name) => {
@@ -88,6 +89,7 @@ const EditNodeModal = forwardRef(
     }, [modalOpen]);
 
     const [errorDuplicateKey, setErrorDuplicateKey] = useState(false);
+    const [adv, setAdv] = useState<boolean | null>(null);
 
     return (
       <BaseModal
@@ -266,11 +268,7 @@ const EditNodeModal = forwardRef(
                                   )}
                                 >
                                   <KeypairListComponent
-                                    advanced={
-                                      myData.current.node?.template[
-                                        templateParam
-                                      ].advanced
-                                    }
+                                    advanced={adv}
                                     disabled={disabled}
                                     editNode={true}
                                     value={
diff --git a/src/frontend/src/types/components/index.ts b/src/frontend/src/types/components/index.ts
index d97c4ef5d..b2d9db7be 100644
--- a/src/frontend/src/types/components/index.ts
+++ b/src/frontend/src/types/components/index.ts
@@ -61,7 +61,7 @@ export type KeyPairListComponentType = {
   disabled: boolean;
   editNode?: boolean;
   duplicateKey?: boolean;
-  advanced?: boolean;
+  advanced?: boolean | null;
 };
 
 export type DictComponentType = {
@@ -135,18 +135,18 @@ export type TooltipComponentType = {
   children: ReactElement;
   title: string | ReactElement;
   placement?:
-    | "bottom-end"
-    | "bottom-start"
-    | "bottom"
-    | "left-end"
-    | "left-start"
-    | "left"
-    | "right-end"
-    | "right-start"
-    | "right"
-    | "top-end"
-    | "top-start"
-    | "top";
+  | "bottom-end"
+  | "bottom-start"
+  | "bottom"
+  | "left-end"
+  | "left-start"
+  | "left"
+  | "right-end"
+  | "right-start"
+  | "right"
+  | "top-end"
+  | "top-start"
+  | "top";
 };
 
 export type ProgressBarType = {