diff --git a/frontend/src/lib/components/GroupEditor.svelte b/frontend/src/lib/components/GroupEditor.svelte
index 3075102d58..7d24311595 100644
--- a/frontend/src/lib/components/GroupEditor.svelte
+++ b/frontend/src/lib/components/GroupEditor.svelte
@@ -234,6 +234,14 @@
 											name,
 											requestBody: { username: member_name }
 										})
+										await GranularAclService.removeGranularAcls({
+											workspace: $workspaceStore ?? '',
+											path: name,
+											kind: 'group_',
+											requestBody: {
+												owner: 'u/' + member_name
+											}
+										})
 										loadGroup()
 									}}>remove</button
 								>
diff --git a/frontend/src/lib/components/apps/editor/AppEditor.svelte b/frontend/src/lib/components/apps/editor/AppEditor.svelte
index 93374a8826..0bf0e68936 100644
--- a/frontend/src/lib/components/apps/editor/AppEditor.svelte
+++ b/frontend/src/lib/components/apps/editor/AppEditor.svelte
@@ -212,7 +212,7 @@
 											<ComponentNavigation />
 
 											<div on:pointerdown|stopPropagation class={width}>
-												<GridEditor {history} {policy} />
+												<GridEditor {policy} />
 											</div>
 
 											<div id="app-editor-top-level-drawer" />
diff --git a/frontend/src/lib/components/apps/editor/AppPreview.svelte b/frontend/src/lib/components/apps/editor/AppPreview.svelte
index 8d926d51be..ccf06d287f 100644
--- a/frontend/src/lib/components/apps/editor/AppPreview.svelte
+++ b/frontend/src/lib/components/apps/editor/AppPreview.svelte
@@ -4,6 +4,7 @@
 	import { buildWorld, type World } from '../rx'
 	import type {
 		App,
+		AppEditorContext,
 		AppViewerContext,
 		ConnectingInput,
 		EditorBreakpoint,
@@ -64,6 +65,12 @@
 		parentWidth: writable(0)
 	})
 
+	setContext<AppEditorContext>('AppEditorContext', {
+		history: undefined,
+		componentControl: writable({}),
+		pickVariableCallback: writable(undefined)
+	})
+
 	let mounted = false
 
 	onMount(() => {
diff --git a/frontend/src/lib/components/apps/editor/GridEditor.svelte b/frontend/src/lib/components/apps/editor/GridEditor.svelte
index 818c9779dd..f4380d70bd 100644
--- a/frontend/src/lib/components/apps/editor/GridEditor.svelte
+++ b/frontend/src/lib/components/apps/editor/GridEditor.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { getContext, afterUpdate } from 'svelte'
+	import { getContext, afterUpdate, setContext } from 'svelte'
 	import type { App, AppEditorContext, AppViewerContext, GridItem } from '../types'
 	import Grid from '@windmill-labs/svelte-grid'
 	import { classNames } from '$lib/utils'
@@ -15,7 +15,6 @@
 	import { expandGriditem, findGridItem } from './appUtils'
 
 	export let policy: Policy
-	export let history: History<App> | undefined = undefined
 
 	const {
 		selectedComponent,
@@ -30,6 +29,8 @@
 		breakpoint
 	} = getContext<AppViewerContext>('AppViewerContext')
 
+	const { history } = getContext<AppEditorContext>('AppEditorContext')
+
 	// The drag is disabled when the user is connecting an input
 	// or when the user is previewing the app
 	// or when the focused grid is a subgrid