diff --git a/packages/ui/src/Atoms/DataTable/DataTable.tsx b/packages/ui/src/Atoms/DataTable/DataTable.tsx
index a6d360587..9e6d40c14 100644
--- a/packages/ui/src/Atoms/DataTable/DataTable.tsx
+++ b/packages/ui/src/Atoms/DataTable/DataTable.tsx
@@ -85,7 +85,6 @@ export function RowButton({
     children,
     ...props
 }: {
-    colspan?: number;
     children: ReactNode;
     icon?: FC<{ size: number; className?: string }>;
 } & ComponentPropsWithRef<"button">) {
@@ -94,7 +93,10 @@ export function RowButton({
         <button
             {...props}
             type="button"
-            className="py-2 bg-highlight hover:bg-highlight-hover active:bg-highlight-pressed           cursor-pointer w-full flex gap-2 items-center justify-center text-sm text-txt-secondary"
+            className={clsx(
+                "py-2 bg-highlight hover:bg-highlight-hover active:bg-highlight-pressed cursor-pointer w-full flex gap-2 items-center justify-center text-sm text-txt-secondary",
+                props.className,
+            )}
             style={{ gridColumnEnd: -1, gridColumnStart: 1 }}
         >
             <IconComponent size={16} />
diff --git a/packages/ui/src/Molecules/Table/TextCell.tsx b/packages/ui/src/Molecules/Table/TextCell.tsx
index 4f8ecf208..c34d9a858 100644
--- a/packages/ui/src/Molecules/Table/TextCell.tsx
+++ b/packages/ui/src/Molecules/Table/TextCell.tsx
@@ -28,10 +28,6 @@ export function TextCell(props: Props) {
         onUpdate(props.name, inputValue);
     };
 
-    // Keep the value in sync with the props.defaultValue if defaultValue changes
-    useEffect(() => {
-        setValue(props.defaultValue);
-    }, [props.defaultValue]);
     return (
         <EditableCell
             name={props.name}