diff --git a/src/frontend/src/CustomNodes/GenericNode/index.tsx b/src/frontend/src/CustomNodes/GenericNode/index.tsx
index 421db75e8..b8c3abc45 100644
--- a/src/frontend/src/CustomNodes/GenericNode/index.tsx
+++ b/src/frontend/src/CustomNodes/GenericNode/index.tsx
@@ -332,8 +332,8 @@ export default function GenericNode({
                       />
                     </div>
                   ) : (
-                    <ShadTooltip content={data.node?.display_name}>
-                      <div className="group flex items-center gap-2.5">
+                    <div className="group flex items-center gap-2.5">
+                      <ShadTooltip content={data.node?.display_name}>
                         <div
                           onDoubleClick={(event) => {
                             if (nameEditable) {
@@ -348,24 +348,23 @@ export default function GenericNode({
                         >
                           {data.node?.display_name}
                         </div>
-
-                        {nameEditable && (
-                          <div
-                            onClick={(event) => {
-                              setInputName(true);
-                              takeSnapshot();
-                              event.stopPropagation();
-                              event.preventDefault();
-                            }}
-                          >
-                            <IconComponent
-                              name="Pencil"
-                              className="hidden h-4 w-4 animate-pulse text-status-blue group-hover:block"
-                            />
-                          </div>
-                        )}
-                      </div>
-                    </ShadTooltip>
+                      </ShadTooltip>
+                      {nameEditable && (
+                        <div
+                          onClick={(event) => {
+                            setInputName(true);
+                            takeSnapshot();
+                            event.stopPropagation();
+                            event.preventDefault();
+                          }}
+                        >
+                          <IconComponent
+                            name="Pencil"
+                            className="hidden h-4 w-4 animate-pulse text-status-blue group-hover:block"
+                          />
+                        </div>
+                      )}
+                    </div>
                   )}
                 </div>
               )}