diff --git a/src/frontend/src/CustomNodes/GenericNode/index.tsx b/src/frontend/src/CustomNodes/GenericNode/index.tsx
index 26def31e6..22c33ee86 100644
--- a/src/frontend/src/CustomNodes/GenericNode/index.tsx
+++ b/src/frontend/src/CustomNodes/GenericNode/index.tsx
@@ -147,9 +147,9 @@ export default function GenericNode({
           "generic-node-div"
         )}
         onDoubleClick={() => {
-          console.log(openAdvancedModal);
-
-          setOpenAdvancedModal(true);
+          if (!inputName) {
+            setOpenAdvancedModal(true);
+          }
         }}
       >
         {data.node?.beta && showNode && (
@@ -219,9 +219,11 @@ export default function GenericNode({
                     <ShadTooltip content={data.node?.display_name}>
                       <div
                         className="flex items-center gap-2"
-                        onDoubleClick={() => {
+                        onDoubleClick={(event) => {
                           setInputName(true);
                           takeSnapshot();
+                          event.stopPropagation();
+                          event.preventDefault();
                         }}
                       >
                         <div