diff --git a/packages/dm-core-plugins/src/data-grid/DataGridActions/DataGridActions.tsx b/packages/dm-core-plugins/src/data-grid/DataGridActions/DataGridActions.tsx
index 92a46aec5..acd764934 100644
--- a/packages/dm-core-plugins/src/data-grid/DataGridActions/DataGridActions.tsx
+++ b/packages/dm-core-plugins/src/data-grid/DataGridActions/DataGridActions.tsx
@@ -156,16 +156,18 @@ export function DataGridActions(props: DataGridActionsProps) {
           <Icon size={16} data={settings} />
         </Styled.ActionRowButton>
       </Tooltip>
-      <Tooltip title='Clear table content'>
-        <Styled.ActionRowButton
-          aria-haspopup
-          aria-expanded={isMenuOpen}
-          onClick={() => clearTable()}
-          ref={setMenuButtonAnchor}
-        >
-          <Icon size={16} data={delete_to_trash} />
-        </Styled.ActionRowButton>
-      </Tooltip>
+      {functionality.rowsAreEditable && functionality.addButtonIsEnabled && (
+        <Tooltip title='Clear table content'>
+          <Styled.ActionRowButton
+            aria-haspopup
+            aria-expanded={isMenuOpen}
+            onClick={() => clearTable()}
+            ref={setMenuButtonAnchor}
+          >
+            <Icon size={16} data={delete_to_trash} />
+          </Styled.ActionRowButton>
+        </Tooltip>
+      )}
       <Menu
         anchorEl={menuButtonAnchor}
         id='table-setting-menu'
diff --git a/packages/dm-core-plugins/src/data-grid/DataGridPlugin.tsx b/packages/dm-core-plugins/src/data-grid/DataGridPlugin.tsx
index c7e4d289b..9708247be 100644
--- a/packages/dm-core-plugins/src/data-grid/DataGridPlugin.tsx
+++ b/packages/dm-core-plugins/src/data-grid/DataGridPlugin.tsx
@@ -123,7 +123,11 @@ export function DataGridPlugin(props: IUIPlugin) {
   }
 
   return !data ? null : (
-    <Stack className='dm-plugin-padding' alignItems='flex-start' spacing={1}>
+    <Stack
+      className='dm-plugin-padding w-full'
+      alignItems='flex-start'
+      spacing={1}
+    >
       <DataGrid
         attributeType={attribute?.attributeType || 'string'}
         config={userConfig}