diff --git a/src/frontend/src/CustomNodes/GenericNode/components/NodeStatus/index.tsx b/src/frontend/src/CustomNodes/GenericNode/components/NodeStatus/index.tsx
index 2ca06afcdbe..cdb33c7a4f2 100644
--- a/src/frontend/src/CustomNodes/GenericNode/components/NodeStatus/index.tsx
+++ b/src/frontend/src/CustomNodes/GenericNode/components/NodeStatus/index.tsx
@@ -84,11 +84,7 @@ export default function NodeStatus({
     );
 
     const baseBorderClass = getBaseBorderClass(selected);
-    const names = classNames(
-      baseBorderClass,
-      "generic-node-div group/node",
-      specificClassFromBuildStatus,
-    );
+    const names = classNames(baseBorderClass, specificClassFromBuildStatus);
     return names;
   };
 
diff --git a/src/frontend/src/CustomNodes/GenericNode/index.tsx b/src/frontend/src/CustomNodes/GenericNode/index.tsx
index 25dc6c91f44..b23abd55fd8 100644
--- a/src/frontend/src/CustomNodes/GenericNode/index.tsx
+++ b/src/frontend/src/CustomNodes/GenericNode/index.tsx
@@ -291,6 +291,7 @@ export default function GenericNode({
         className={cn(
           borderColor,
           showNode ? "w-96 rounded-lg" : "w-26 h-26 rounded-full",
+          "generic-node-div group/node",
         )}
       >
         {data.node?.beta && showNode && (