diff --git a/packages/twenty-e2e-testing/tests/create-record.spec.ts b/packages/twenty-e2e-testing/tests/create-record.spec.ts
index 26bf6c833d..0abbdfcb76 100644
--- a/packages/twenty-e2e-testing/tests/create-record.spec.ts
+++ b/packages/twenty-e2e-testing/tests/create-record.spec.ts
@@ -64,7 +64,7 @@ test('Create and update record', async ({ page }) => {
     await lastNameInput.press('Enter');
 
     // Focus on recordFieldList
-    const recordFieldList = page.getByTestId('record-fields-widget');
+    const recordFieldList = page.getByTestId('person-widget-fields');
     await expect(recordFieldList).toBeVisible();
     await recordFieldList.getByText('Emails').first().click();
 
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetCardShell.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetCardShell.tsx
index 04f778a38b..643785a330 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetCardShell.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetCardShell.tsx
@@ -67,9 +67,6 @@ export const WidgetCardShell = ({
 }: WidgetCardShellProps) => {
   const { theme } = useContext(ThemeContext);
 
-  const dataTestId =
-    widget.type === WidgetType.FIELDS ? 'record-fields-widget' : widget.id;
-
   return (
     <WidgetComponentInstanceContext.Provider value={{ instanceId: widget.id }}>
       <WidgetCard
@@ -84,7 +81,7 @@ export const WidgetCardShell = ({
         onMouseEnter={onMouseEnter}
         onMouseLeave={onMouseLeave}
         data-widget-id={widget.id}
-        data-testid={dataTestId}
+        data-testid={widget.id}
         className="widget"
       >
         {showHeader && (