diff --git a/frontend/src/lib/components/apps/components/display/table/AppAggridTable.svelte b/frontend/src/lib/components/apps/components/display/table/AppAggridTable.svelte
index 5b1bc1cea2..bdd02be4ec 100644
--- a/frontend/src/lib/components/apps/components/display/table/AppAggridTable.svelte
+++ b/frontend/src/lib/components/apps/components/display/table/AppAggridTable.svelte
@@ -46,6 +46,7 @@
 	import InputValue from '../../helpers/InputValue.svelte'
 	import { stateSnapshot, withProps } from '$lib/svelte5Utils.svelte'
 	import { get } from 'svelte/store'
+	import SubGridEditor from '$lib/components/apps/editor/SubGridEditor.svelte'
 
 	interface Props {
 		// import 'ag-grid-community/dist/styles/ag-theme-alpine-dark.css'
@@ -598,6 +599,13 @@
 	/>
 {/each}
 
+{#if render == false || loading || initializing}
+	<div class="overflow-hidden h-0">
+		{#each actions?.filter((x) => x.type == 'modalcomponent') ?? [] as action}
+			<SubGridEditor id={action.id} subGridId={`${action.id}-0`} />
+		{/each}
+	</div>
+{/if}
 <RunnableWrapper
 	{outputs}
 	{render}
diff --git a/frontend/src/lib/components/apps/components/display/table/AppAggridTableActions.svelte b/frontend/src/lib/components/apps/components/display/table/AppAggridTableActions.svelte
index 3b9c3eef96..6bcb2dd1d2 100644
--- a/frontend/src/lib/components/apps/components/display/table/AppAggridTableActions.svelte
+++ b/frontend/src/lib/components/apps/components/display/table/AppAggridTableActions.svelte
@@ -22,7 +22,7 @@
 	import AppModal from '../../layout/AppModal.svelte'
 
 	interface Props {
-		p: ICellRendererParams<any>
+		p?: ICellRendererParams<any>
 		id: string
 		render: boolean
 		actions?: TableAction[]
@@ -89,7 +89,7 @@
 					}
 				})}
 				onpointerdown={stopPropagation((e) => {
-					selectRow(p)
+					p && selectRow(p)
 
 					if (!$connectingInput.opened) {
 						$selectedComponent = [action.id]
@@ -195,7 +195,7 @@
 							noWFull
 							preclickAction={async () => {
 								dispatch('toggleRow')
-								selectRow(p)
+								p && selectRow(p)
 							}}
 							id={action.id}
 							customCss={action.customCss}
@@ -219,7 +219,7 @@
 							verticalAlignment="center"
 							preclickAction={async () => {
 								dispatch('toggleRow')
-								selectRow(p)
+								p && selectRow(p)
 							}}
 						/>
 					{:else if action.type == 'checkboxcomponent'}
@@ -234,7 +234,7 @@
 							onToggle={action.onToggle}
 							preclickAction={async () => {
 								dispatch('toggleRow')
-								selectRow(p)
+								p && selectRow(p)
 							}}
 							verticalAlignment="center"
 							{controls}
@@ -254,7 +254,7 @@
 								onSelect={action.onSelect}
 								preclickAction={async () => {
 									dispatch('toggleRow')
-									selectRow(p)
+									p && selectRow(p)
 								}}
 								{controls}
 							/>
@@ -267,7 +267,7 @@
 						{render}
 						preclickAction={async () => {
 							dispatch('toggleRow')
-							selectRow(p)
+							p && selectRow(p)
 						}}
 						noWFull
 						id={action.id}
@@ -290,7 +290,7 @@
 						verticalAlignment="center"
 						preclickAction={async () => {
 							dispatch('toggleRow')
-							selectRow(p)
+							p && selectRow(p)
 						}}
 					/>
 				{:else if action.type == 'checkboxcomponent'}
@@ -305,7 +305,7 @@
 						onToggle={action.onToggle}
 						preclickAction={async () => {
 							dispatch('toggleRow')
-							selectRow(p)
+							p && selectRow(p)
 						}}
 					/>
 				{:else if action.type == 'selectcomponent'}
@@ -323,7 +323,7 @@
 							onSelect={action.onSelect}
 							preclickAction={async () => {
 								dispatch('toggleRow')
-								selectRow(p)
+								p && selectRow(p)
 							}}
 						/>
 					</div>
diff --git a/frontend/src/lib/components/apps/editor/appUtilsCore.ts b/frontend/src/lib/components/apps/editor/appUtilsCore.ts
index a2995291f2..3ed24f4655 100644
--- a/frontend/src/lib/components/apps/editor/appUtilsCore.ts
+++ b/frontend/src/lib/components/apps/editor/appUtilsCore.ts
@@ -30,6 +30,7 @@ export function allItems(
 export function findGridItem(app: App, id: string): GridItem | undefined {
 	return findGridItemById(app.grid, app.subgrids, id)
 }
+
 export function collectOneOfFields(fields: AppInputs, app: App): Record<string, any[]> {
 	return Object.fromEntries(
 		Object.entries(fields ?? {})
diff --git a/frontend/src/lib/components/sidebar/SidebarContent.svelte b/frontend/src/lib/components/sidebar/SidebarContent.svelte
index 7c985135ba..7a6f15399b 100644
--- a/frontend/src/lib/components/sidebar/SidebarContent.svelte
+++ b/frontend/src/lib/components/sidebar/SidebarContent.svelte
@@ -99,7 +99,6 @@
 	async function loadAvailableNativeTriggers() {
 		try {
 			const services = await getAvailableNativeTriggerServices($workspaceStore!)
-			console.log({ services })
 			const serviceData = await Promise.all(
 				services.map(async (service) => ({
 					service,