diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/CustomProperty/CustomPropertyTable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/CustomProperty/CustomPropertyTable.tsx
index 81762261bcc..8bf877de094 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/CustomProperty/CustomPropertyTable.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/CustomProperty/CustomPropertyTable.tsx
@@ -269,6 +269,7 @@ export const CustomPropertyTable: FC<CustomPropertyTableProp> = ({
     <Fragment>
       <Table
         bordered
+        className="entity-custom-properties-table"
         columns={tableColumn}
         data-testid="entity-custom-properties-table"
         dataSource={customProperties}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.tsx
index 7fd56cb3500..391d9062e94 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.tsx
@@ -294,28 +294,27 @@ export const CustomPropertyTable = <T extends ExtentionEntitiesKeys>({
               </div>
             </>
           ) : (
-            <Row
-              className="custom-properties-card"
-              data-testid="custom-properties-card"
-              gutter={[16, 16]}>
-              {dataSourceColumns.map((columns, colIndex) => (
-                <Col key={colIndex} span={8}>
-                  {columns.map((record) => (
-                    <div key={record.name} style={{ marginBottom: '16px' }}>
-                      <PropertyValue
-                        extension={extensionObject.extensionObject}
-                        hasEditPermissions={hasEditAccess}
-                        isRenderedInRightPanel={isRenderedInRightPanel}
-                        isVersionView={isVersionView}
-                        property={record}
-                        versionDataKeys={extensionObject.addedKeysList}
-                        onExtensionUpdate={onExtensionUpdate}
-                      />
-                    </div>
-                  ))}
-                </Col>
-              ))}
-            </Row>
+            <div className="custom-properties-card">
+              <Row data-testid="custom-properties-card" gutter={[16, 16]}>
+                {dataSourceColumns.map((columns, colIndex) => (
+                  <Col key={colIndex} span={8}>
+                    {columns.map((record) => (
+                      <div key={record.name} style={{ marginBottom: '16px' }}>
+                        <PropertyValue
+                          extension={extensionObject.extensionObject}
+                          hasEditPermissions={hasEditAccess}
+                          isRenderedInRightPanel={isRenderedInRightPanel}
+                          isVersionView={isVersionView}
+                          property={record}
+                          versionDataKeys={extensionObject.addedKeysList}
+                          onExtensionUpdate={onExtensionUpdate}
+                        />
+                      </div>
+                    ))}
+                  </Col>
+                ))}
+              </Row>
+            </div>
           )}
         </>
       )}
diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/app.less b/openmetadata-ui/src/main/resources/ui/src/styles/app.less
index a8fa6627d25..ddf1c6944f1 100644
--- a/openmetadata-ui/src/main/resources/ui/src/styles/app.less
+++ b/openmetadata-ui/src/main/resources/ui/src/styles/app.less
@@ -829,7 +829,8 @@ a[href].link-text-grey,
   .roles-list-table,
   .list-table,
   .kpi-table,
-  .custom-properties-card {
+  .custom-properties-card,
+  .entity-custom-properties-table {
     margin-right: 64px;
   }
 }