diff --git a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
index f751ac6cf..3726d1102 100644
--- a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
@@ -783,7 +783,10 @@ export default function NodeToolbarComponent({
                 open={openModal}
                 setOpen={setOpenModal}
                 dynamic={true}
-                setNodeClass={handleNodeClass}
+                setNodeClass={(apiClassType, type) => {
+                  handleNodeClass(apiClassType, type);
+                  setToolMode(false);
+                }}
                 nodeClass={data.node}
                 value={data.node?.template[name].value ?? ""}
               >