diff --git a/packages/bbui/src/ButtonGroup/CollapsedButtonGroup.svelte b/packages/bbui/src/ButtonGroup/CollapsedButtonGroup.svelte
index e8362efc4b..42e2451ad4 100644
--- a/packages/bbui/src/ButtonGroup/CollapsedButtonGroup.svelte
+++ b/packages/bbui/src/ButtonGroup/CollapsedButtonGroup.svelte
@@ -9,6 +9,7 @@
   export let size = "M"
   export let align = "left"
   export let offset
+  export let animate
 
   let anchor
   let popover
@@ -28,7 +29,14 @@
 >
   {text || "Action"}
 </Button>
-<Popover bind:this={popover} {align} {anchor} {offset} resizable={false}>
+<Popover
+  bind:this={popover}
+  {align}
+  {anchor}
+  {offset}
+  {animate}
+  resizable={false}
+>
   <Menu>
     {#each buttons as button}
       <MenuItem on:click={() => handleClick(button)} disabled={button.disabled}>
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
index c88317c79f..aca3e950c3 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
@@ -190,7 +190,7 @@
         {#if isTrigger && triggerInfo}
           <InlineAlert
             header={triggerInfo.type}
-            message={`This trigger is tied to the row action ${triggerInfo.rowAction.name} on your ${triggerInfo.table.name} table`}
+            message={`This trigger is tied to the "${triggerInfo.rowAction.name}" row action in your ${triggerInfo.table.name} table`}
           />
         {/if}
         {#if lastStep}
diff --git a/packages/builder/src/components/automation/AutomationPanel/AutomationNavItem.svelte b/packages/builder/src/components/automation/AutomationPanel/AutomationNavItem.svelte
index 8ab9851ff0..ec9b956190 100644
--- a/packages/builder/src/components/automation/AutomationPanel/AutomationNavItem.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/AutomationNavItem.svelte
@@ -9,6 +9,7 @@
   import { sdk } from "@budibase/shared-core"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import UpdateAutomationModal from "components/automation/AutomationPanel/UpdateAutomationModal.svelte"
+  import UpdateRowActionModal from "components/automation/AutomationPanel/UpdateRowActionModal.svelte"
   import NavItem from "components/common/NavItem.svelte"
 
   export let automation
@@ -16,6 +17,9 @@
 
   let confirmDeleteDialog
   let updateAutomationDialog
+  let updateRowActionDialog
+
+  $: isRowAction = sdk.automations.isRowAction(automation)
 
   async function deleteAutomation() {
     try {
@@ -37,7 +41,6 @@
   }
 
   const getContextMenuItems = () => {
-    const isRowAction = sdk.automations.isRowAction(automation)
     const pause = {
       icon: automation.disabled ? "CheckmarkCircle" : "Cancel",
       name: automation.disabled ? "Activate" : "Pause",
@@ -83,7 +86,16 @@
         del,
       ]
     } else {
-      return [del]
+      return [
+        {
+          icon: "Edit",
+          name: "Edit",
+          keyBind: null,
+          visible: true,
+          callback: updateRowActionDialog.show,
+        },
+        del,
+      ]
     }
   }
 
@@ -122,4 +134,9 @@
   <i>{automation.name}?</i>
   This action cannot be undone.
 </ConfirmDialog>
-<UpdateAutomationModal {automation} bind:this={updateAutomationDialog} />
+
+{#if isRowAction}
+  <UpdateRowActionModal {automation} bind:this={updateRowActionDialog} />
+{:else}
+  <UpdateAutomationModal {automation} bind:this={updateAutomationDialog} />
+{/if}
diff --git a/packages/builder/src/components/automation/AutomationPanel/UpdateRowActionModal.svelte b/packages/builder/src/components/automation/AutomationPanel/UpdateRowActionModal.svelte
new file mode 100644
index 0000000000..af754d7ca9
--- /dev/null
+++ b/packages/builder/src/components/automation/AutomationPanel/UpdateRowActionModal.svelte
@@ -0,0 +1,85 @@
+<script>
+  import { automationStore } from "stores/builder"
+  import {
+    notifications,
+    Icon,
+    Input,
+    ModalContent,
+    Modal,
+  } from "@budibase/bbui"
+  import { API } from "api"
+
+  export let automation
+  export let onCancel = undefined
+
+  let name
+  let error = ""
+  let modal
+
+  export const show = () => {
+    name = automation?.displayName
+    modal.show()
+  }
+  export const hide = () => {
+    modal.hide()
+  }
+
+  async function saveAutomation() {
+    try {
+      await API.rowActions.update({
+        rowActionId: automation.definition.trigger.inputs.rowActionId,
+        tableId: automation.definition.trigger.inputs.tableId,
+        name,
+      })
+      await automationStore.actions.fetch()
+      notifications.success(`Row action updated successfully`)
+      hide()
+    } catch (error) {
+      notifications.error("Error saving row action")
+    }
+  }
+
+  function checkValid(evt) {
+    name = evt.target.value
+    if (!name) {
+      error = "Name is required"
+      return
+    }
+    error = ""
+  }
+</script>
+
+<Modal bind:this={modal} on:hide={onCancel}>
+  <ModalContent
+    title="Edit Row Action"
+    confirmText="Save"
+    size="L"
+    onConfirm={saveAutomation}
+    disabled={error}
+  >
+    <Input bind:value={name} label="Name" on:input={checkValid} {error} />
+    <a
+      slot="footer"
+      target="_blank"
+      href="https://docs.budibase.com/docs/automation-steps"
+    >
+      <Icon name="InfoOutline" />
+      <span>Learn about automations</span>
+    </a>
+  </ModalContent>
+</Modal>
+
+<style>
+  a {
+    color: var(--ink);
+    font-size: 14px;
+    vertical-align: middle;
+    display: flex;
+    align-items: center;
+    text-decoration: none;
+  }
+  a span {
+    text-decoration: underline;
+    margin-left: var(--spectrum-alias-item-padding-s);
+  }
+</style>
diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/GridColumnsSettingButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridColumnsSettingButton.svelte
index 11109c0f78..c75c1b8568 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridColumnsSettingButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridColumnsSettingButton.svelte
@@ -2,8 +2,7 @@
   import { getContext } from "svelte"
   import { ActionButton, Popover } from "@budibase/bbui"
   import ColumnsSettingContent from "./ColumnsSettingContent.svelte"
-
-  export let allowViewReadonlyColumns = false
+  import { licensing } from "stores/portal"
 
   const { columns } = getContext("grid")
 
@@ -29,5 +28,8 @@
 </div>
 
 <Popover bind:open {anchor} align="left">
-  <ColumnsSettingContent columns={$columns} {allowViewReadonlyColumns} />
+  <ColumnsSettingContent
+    columns={$columns}
+    allowViewReadonlyColumns={$licensing.isViewReadonlyColumnsEnabled}
+  />
 </Popover>
diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/GridRowActionsButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridRowActionsButton.svelte
index 193a977a46..9adbca7603 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridRowActionsButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridRowActionsButton.svelte
@@ -22,7 +22,7 @@
   $: ds = $datasource
   $: tableId = ds?.tableId
   $: isView = ds?.type === "viewV2"
-  $: fetchRowActions(tableId)
+  $: fetchRowActions(ds)
   $: actionCount = rowActions.filter(action => !isView || action.enabled).length
 
   const rowActionUrl = derived([url, appStore], ([$url, $appStore]) => {
@@ -31,12 +31,12 @@
     }
   })
 
-  const fetchRowActions = async tableId => {
-    if (!tableId) {
+  const fetchRowActions = async datasource => {
+    if (!datasource?.tableId) {
       rowActions = []
       return
     }
-    const res = await API.rowActions.fetch(tableId)
+    const res = await API.rowActions.fetch(datasource.tableId)
     rowActions = Object.values(res || {}).map(action => ({
       ...action,
       enabled: !isView || action.allowedViews?.includes(ds.id),
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/[viewId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/[viewId]/index.svelte
index 798d1e0b51..e3020394df 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/[viewId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/[viewId]/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import { viewsV2 } from "stores/builder"
-  import { admin, licensing } from "stores/portal"
+  import { admin } from "stores/portal"
   import { Grid } from "@budibase/frontend-core"
   import { API } from "api"
   import GridCreateEditRowModal from "components/backend/DataTable/modals/grid/GridCreateEditRowModal.svelte"
@@ -35,7 +35,6 @@
   showAvatars={false}
   on:updatedatasource={handleGridViewUpdate}
   isCloud={$admin.cloud}
-  allowViewReadonlyColumns={$licensing.isViewReadonlyColumnsEnabled}
 >
   <svelte:fragment slot="controls">
     <GridFilterButton />
diff --git a/packages/builder/src/stores/portal/licensing.js b/packages/builder/src/stores/portal/licensing.js
index 0e44650479..dd9747aa09 100644
--- a/packages/builder/src/stores/portal/licensing.js
+++ b/packages/builder/src/stores/portal/licensing.js
@@ -104,6 +104,7 @@ export const createLicensingStore = () => {
       const isBusinessPlan = planType === Constants.PlanType.BUSINESS
       const isEnterpriseTrial =
         planType === Constants.PlanType.ENTERPRISE_BASIC_TRIAL
+      console.log(license)
       const groupsEnabled = license.features.includes(
         Constants.Features.USER_GROUPS
       )
@@ -142,6 +143,8 @@ export const createLicensingStore = () => {
         Constants.Features.VIEW_READONLY_COLUMNS
       )
 
+      console.log(isViewReadonlyColumnsEnabled)
+
       store.update(state => {
         return {
           ...state,
diff --git a/packages/frontend-core/src/api/rowActions.js b/packages/frontend-core/src/api/rowActions.js
index 4c0cd5f58b..071af953ef 100644
--- a/packages/frontend-core/src/api/rowActions.js
+++ b/packages/frontend-core/src/api/rowActions.js
@@ -31,7 +31,7 @@ export const buildRowActionEndpoints = API => ({
    * @param rowActionId the ID of the row action to update
    */
   update: async ({ tableId, rowActionId, name }) => {
-    return await API.post({
+    return await API.put({
       url: `/api/tables/${tableId}/actions/${rowActionId}`,
       body: {
         name,
diff --git a/packages/frontend-core/src/components/grid/layout/ButtonColumn.svelte b/packages/frontend-core/src/components/grid/layout/ButtonColumn.svelte
index 25a594dbb5..4ec1fd6879 100644
--- a/packages/frontend-core/src/components/grid/layout/ButtonColumn.svelte
+++ b/packages/frontend-core/src/components/grid/layout/ButtonColumn.svelte
@@ -91,6 +91,7 @@
                   align="right"
                   offset={5}
                   size="S"
+                  animate={false}
                 />
               {:else}
                 {#each buttons as button}
diff --git a/packages/server/src/sdk/app/automations/utils.ts b/packages/server/src/sdk/app/automations/utils.ts
index 2ce0012b6a..2c34de255b 100644
--- a/packages/server/src/sdk/app/automations/utils.ts
+++ b/packages/server/src/sdk/app/automations/utils.ts
@@ -52,7 +52,7 @@ export async function getBuilderData(
     const rowActionName = await getRowActionName(tableId, rowActionId)
 
     result[automation._id!] = {
-      displayName: `${tableName}: ${automation.name}`,
+      displayName: rowActionName,
       triggerInfo: {
         type: "Automation trigger",
         table: { id: tableId, name: tableName },