diff --git a/packages/builder/src/components/backend/DataTable/TableDataTable.svelte b/packages/builder/src/components/backend/DataTable/TableDataTable.svelte
index 109c965271..58e0a0e691 100644
--- a/packages/builder/src/components/backend/DataTable/TableDataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/TableDataTable.svelte
@@ -57,8 +57,8 @@
   <Grid
     {API}
     datasource={gridDatasource}
-    allowAddRows={!isUsersTable}
-    allowDeleteRows={!isUsersTable}
+    canAddRows={!isUsersTable}
+    canDeleteRows={!isUsersTable}
     schemaOverrides={isUsersTable ? userSchemaOverrides : null}
     showAvatars={false}
     on:updatedatasource={handleGridTableUpdate}
diff --git a/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte b/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte
index 5ce84108c3..c5f1f7896a 100644
--- a/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte
+++ b/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte
@@ -196,7 +196,6 @@
         icon="Label"
         on:click={makeDisplayColumn}
         disabled={idx === "sticky" ||
-          !$config.canEditPrimaryDisplay ||
           bannedDisplayColumnTypes.includes(column.schema.type)}
       >
         Use as display column
diff --git a/packages/frontend-core/src/components/grid/stores/columns.js b/packages/frontend-core/src/components/grid/stores/columns.js
index 8059bd98d7..09e25586fd 100644
--- a/packages/frontend-core/src/components/grid/stores/columns.js
+++ b/packages/frontend-core/src/components/grid/stores/columns.js
@@ -80,9 +80,6 @@ export const createActions = context => {
 
   // Updates the datasources primary display column
   const changePrimaryDisplay = async column => {
-    if (!get(config).canEditPrimaryDisplay) {
-      return
-    }
     return await datasource.actions.saveDefinition({
       ...get(definition),
       primaryDisplay: column,
diff --git a/packages/frontend-core/src/components/grid/stores/config.js b/packages/frontend-core/src/components/grid/stores/config.js
index 46bff299d4..ae995b4ac7 100644
--- a/packages/frontend-core/src/components/grid/stores/config.js
+++ b/packages/frontend-core/src/components/grid/stores/config.js
@@ -1,8 +1,8 @@
 import { derivedMemo } from "../../../utils"
 import { derived } from "svelte/store"
 
-export const deriveStores = context => {
-  const { props, hasNonAutoColumn } = context
+export const createStores = context => {
+  const { props } = context
   const getProp = prop => derivedMemo(props, $props => $props[prop])
 
   // Derive and memoize some props so that we can react to them in isolation
@@ -16,16 +16,27 @@ export const deriveStores = context => {
   const notifySuccess = getProp("notifySuccess")
   const notifyError = getProp("notifyError")
 
+  return {
+    datasource,
+    initialSortColumn,
+    initialSortOrder,
+    initialFilter,
+    fixedRowHeight,
+    schemaOverrides,
+    columnWhitelist,
+    notifySuccess,
+    notifyError,
+  }
+}
+
+export const deriveStores = context => {
+  const { props, hasNonAutoColumn } = context
+
   // Derive features
   const config = derived(
     [props, hasNonAutoColumn],
     ([$props, $hasNonAutoColumn]) => {
-      let config = {
-        ...$props,
-
-        // Additional granular features which we don't expose as props
-        canEditPrimaryDisplay: $props.canEditColumns,
-      }
+      let config = { ...$props }
 
       // Disable some features if we're editing a view
       if ($props.datasource?.type === "viewV2") {
@@ -43,14 +54,5 @@ export const deriveStores = context => {
 
   return {
     config,
-    datasource,
-    initialSortColumn,
-    initialSortOrder,
-    initialFilter,
-    fixedRowHeight,
-    schemaOverrides,
-    columnWhitelist,
-    notifySuccess,
-    notifyError,
   }
 }